]> sigrok.org Git - libsigrokdecode.git/blobdiff - controller.c
srd: Drop unneeded check, g_free() handles NULL fine.
[libsigrokdecode.git] / controller.c
index e325e0a6208cf98248101673c0c9714c27ffdfc0..20927cf9b80525a32b5b60f960dc60471cbd6734 100644 (file)
@@ -272,8 +272,7 @@ err_out:
        Py_XDECREF(py_di_options);
        Py_XDECREF(py_dec_optkeys);
        Py_XDECREF(py_dec_options);
-       if (key)
-               g_free(key);
+       g_free(key);
        if (PyErr_Occurred())
                catch_exception("Stray exception in srd_instance_set_options().");
 
@@ -306,6 +305,9 @@ int srd_instance_set_probes(struct srd_decoder_instance *di,
        int *new_probemap, new_probenum;
        char *probe_id, *probenum_str;
 
+       srd_dbg("set probes called for instance %s with list of %d probes",
+                       di->instance_id, g_hash_table_size(new_probes));
+
        if (g_hash_table_size(new_probes) == 0)
                /* No probes provided. */
                return SRD_OK;
@@ -347,6 +349,7 @@ int srd_instance_set_probes(struct srd_decoder_instance *di,
                }
                p = sl->data;
                new_probemap[p->order] = new_probenum;
+               srd_dbg("setting probe mapping for %d = probe %d", p->order, new_probenum);
        }
        g_free(di->dec_probemap);
        di->dec_probemap = new_probemap;