sr: g_free()/g_string_free() can handle NULL input.

[libsigrok.git] / hwplugin.c

diff --git a/hwplugin.c b/hwplugin.c
index fcaaba9351a8bf1cb0128a98c4819bd055b478f3..23bbef4455463503ceb49f35bde6659b8e3a06b2 100644 (file)
--- a/hwplugin.c
+++ b/hwplugin.c
@@ -113,22 +113,23 @@ int sr_init_hwplugins(struct sr_device_plugin *plugin)
        struct sr_device *device;
        char **probe_names;
 
-       g_message("initializing %s plugin", plugin->name);
+       sr_dbg("initializing %s plugin", plugin->name);
        num_devices = plugin->init(NULL);
        for (i = 0; i < num_devices; i++) {
                num_probes = GPOINTER_TO_INT(
                                plugin->get_device_info(i, SR_DI_NUM_PROBES));
-               probe_names = (char**)plugin->get_device_info(i, SR_DI_PROBE_NAMES);
+               probe_names = (char **)plugin->get_device_info(i,
+                                                       SR_DI_PROBE_NAMES);
 
                if (!probe_names) {
-                       sr_warn("Plugin %s does not return a list of probe names.", plugin->name);
+                       sr_warn("hwplugin: %s: plugin %s does not return a "
+                               "list of probe names", __func__, plugin->name);
                        continue;
                }
 
                device = sr_device_new(plugin, i);
-               for (j = 0; j < num_probes; j++) {
+               for (j = 0; j < num_probes; j++)
                        sr_device_probe_add(device, probe_names[j]);
-               }
                num_initialized_devices++;
        }
 
@@ -199,9 +200,7 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
                break;
        }
 
-       if (sdi->priv)
-               g_free(sdi->priv);
-
+       g_free(sdi->priv);
        g_free(sdi->vendor);
        g_free(sdi->model);
        g_free(sdi->version);