Make more variables/functions static and non-global.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index 43e6ef7912cf5be03df2eb505a4be41244f6cee9..0ffd6f2eeae77e17bbf0d86046b42771917d6a30 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -28,7 +28,7 @@
 #include <sigrok-internal.h>
 
 /* The list of loaded plugins lives here. */
-GSList *plugins;
+static GSList *plugins;
 
 /*
  * This enumerates which plugin capabilities correspond to user-settable
@@ -68,7 +68,6 @@ extern struct sr_device_plugin link_mso19_plugin_info;
 extern struct sr_device_plugin alsa_plugin_info;
 #endif
 
-
 /* TODO: No linked list needed, this can be a simple array. */
 int load_hwplugins(void)
 {
@@ -99,7 +98,6 @@ int load_hwplugins(void)
        plugins = g_slist_append(plugins, (gpointer *)&alsa_plugin_info);
 #endif
 
-
        return SR_OK;
 }
 
@@ -133,7 +131,6 @@ void sr_cleanup_hwplugins(void)
                if (plugin->cleanup)
                        plugin->cleanup();
        }
-
 }
 
 struct sr_device_instance *sr_device_instance_new(int index, int status,
@@ -195,7 +192,6 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
        g_free(sdi->model);
        g_free(sdi->version);
        g_free(sdi);
-
 }
 
 #ifdef HAVE_LIBUSB_1_0
@@ -218,7 +214,7 @@ struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
 void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
 {
        /* Avoid compiler warnings. */
-       usb = usb;
+       (void)usb;
 
        /* Nothing to do for this device instance type. */
 }