fluke-45: free memory that was allocated by SCPI get routines

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index 1fbba5c1a5aff810839fc50606896e8b5b157783..9be64cd139be67af909846f86844ec0be9f0cf10 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -164,6 +164,16 @@ SR_API GSList *sr_buildinfo_libs_get(void)
 #endif
        l = g_slist_append(l, m);
 #endif
+#ifdef HAVE_LIBHIDAPI
+       m = g_slist_append(NULL, g_strdup("hidapi"));
+       m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBHIDAPI_VERSION));
+       l = g_slist_append(l, m);
+#endif
+#ifdef HAVE_LIBBLUEZ
+       m = g_slist_append(NULL, g_strdup("bluez"));
+       m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBBLUEZ_VERSION));
+       l = g_slist_append(l, m);
+#endif
 #ifdef HAVE_LIBFTDI
        m = g_slist_append(NULL, g_strdup("libftdi"));
        m = g_slist_append(m, g_strdup_printf("%s", CONF_LIBFTDI_VERSION));
@@ -205,7 +215,7 @@ SR_API char *sr_buildinfo_scpi_backends_get(void)
 #if HAVE_RPC
        g_string_append_printf(s, "RPC, ");
 #endif
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
        g_string_append_printf(s, "serial, ");
 #endif
 #ifdef HAVE_LIBREVISA
@@ -591,6 +601,20 @@ SR_API int sr_init(struct sr_context **ctx)
                ret = SR_ERR;
                goto done;
        }
+#endif
+#ifdef HAVE_LIBHIDAPI
+       /*
+        * According to <hidapi.h>, the hid_init() routine just returns
+        * zero or non-zero, and hid_error() appears to relate to calls
+        * for a specific device after hid_open(). Which means that there
+        * is no more detailled information available beyond success/fail
+        * at this point in time.
+        */
+       if (hid_init() != 0) {
+               sr_err("HIDAPI hid_init() failed.");
+               ret = SR_ERR;
+               goto done;
+       }
 #endif
        sr_resource_set_hooks(context, NULL, NULL, NULL, NULL);
 
@@ -626,6 +650,9 @@ SR_API int sr_exit(struct sr_context *ctx)
        WSACleanup();
 #endif
 
+#ifdef HAVE_LIBHIDAPI
+       hid_exit();
+#endif
 #ifdef HAVE_LIBUSB_1_0
        libusb_exit(ctx->libusb_ctx);
 #endif