Fix various warnings when building without libusb.

  ../src/backend.c: In function 'sr_init':
  ../src/backend.c:435:1: warning: label 'done' defined but not used [-Wunused-label]
   done:
   ^

  ../src/device.c: In function 'sr_dev_inst_connid_get':
  ../src/device.c:525:7: warning: unused variable 'connection_id' [-Wunused-variable]
    char connection_id[64];
         ^
  ../src/device.c:524:20: warning: unused variable 'b' [-Wunused-variable]
    int r, cnt, i, a, b;
                      ^
  ../src/device.c:524:17: warning: unused variable 'a' [-Wunused-variable]
    int r, cnt, i, a, b;
                   ^
  ../src/device.c:524:14: warning: unused variable 'i' [-Wunused-variable]
    int r, cnt, i, a, b;
                ^
  ../src/device.c:524:9: warning: unused variable 'cnt' [-Wunused-variable]
    int r, cnt, i, a, b;
           ^
  ../src/device.c:524:6: warning: unused variable 'r' [-Wunused-variable]
    int r, cnt, i, a, b;
        ^
  ../src/device.c:523:22: warning: unused variable 'drvc' [-Wunused-variable]
    struct drv_context *drvc;
                      ^

diff --git a/src/backend.c b/src/backend.c
index b05e8d97a5bf7e817a33fbf741be642127d3b7c7..0103a43a56c3906ccae8bf1c23da0123ed603584 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -432,7 +432,9 @@ SR_API int sr_init(struct sr_context **ctx)
        context = NULL;
        ret = SR_OK;
 
+#ifdef HAVE_LIBUSB_1_0
 done:
+#endif
        g_free(context);
        return ret;
 }

diff --git a/src/device.c b/src/device.c
index 3eef7b9efe2a907ee8e29a461bcf34f57cbbcbfe..d7c32567fb7971f62925d118151a8a8b0bab7064 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -520,11 +520,10 @@ SR_API const char *sr_dev_inst_sernum_get(const struct sr_dev_inst *sdi)
  */
 SR_API const char *sr_dev_inst_connid_get(const struct sr_dev_inst *sdi)
 {
+#ifdef HAVE_LIBUSB_1_0
        struct drv_context *drvc;
        int r, cnt, i, a, b;
        char connection_id[64];
-
-#ifdef HAVE_LIBUSB_1_0
        struct sr_usb_dev_inst *usb;
        struct libusb_device **devlist;
        struct libusb_device_descriptor des;