Fix memory leak in print_searchpaths()

[libsigrokdecode.git] / instance.c

diff --git a/instance.c b/instance.c
index b964534aa1f21727f4cabf33076fca62014d48ce..99c5012886b48750f4bcd4f23ac2ffdfbf872666 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -30,11 +30,6 @@
 
 extern SRD_PRIV GSList *sessions;
 
-static void srd_inst_join_decode_thread(struct srd_decoder_inst *di);
-static void srd_inst_reset_state(struct srd_decoder_inst *di);
-static void oldpins_array_seed(struct srd_decoder_inst *di);
-static void oldpins_array_free(struct srd_decoder_inst *di);
-
 /** @endcond */
 
 /**
@@ -51,6 +46,36 @@ static void oldpins_array_free(struct srd_decoder_inst *di);
  * @{
  */
 
+static void oldpins_array_seed(struct srd_decoder_inst *di)
+{
+       size_t count;
+       GArray *arr;
+
+       if (!di)
+               return;
+       if (di->old_pins_array)
+               return;
+
+       count = di->dec_num_channels;
+       arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count);
+       g_array_set_size(arr, count);
+       memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count);
+       di->old_pins_array = arr;
+}
+
+static void oldpins_array_free(struct srd_decoder_inst *di)
+{
+       if (!di)
+               return;
+       if (!di->old_pins_array)
+               return;
+
+       srd_dbg("%s: Releasing initial pin state.", di->inst_id);
+
+       g_array_free(di->old_pins_array, TRUE);
+       di->old_pins_array = NULL;
+}
+
 /**
  * Set one or more options in a decoder instance.
  *
@@ -314,7 +339,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
        PyGILState_STATE gstate;
 
        i = 1;
-       srd_dbg("Creating new %s instance.", decoder_id);
 
        if (!sess)
                return NULL;
@@ -412,7 +436,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
 
        /* Instance takes input from a frontend by default. */
        sess->di_list = g_slist_append(sess->di_list, di);
-       srd_dbg("Created new %s instance with ID %s.", decoder_id, di->inst_id);
+       srd_dbg("Creating new %s instance %s.", decoder_id, di->inst_id);
 
        return di;
 }
@@ -508,7 +532,7 @@ SRD_API int srd_inst_stack(struct srd_session *sess,
        /* Stack on top of source di. */
        di_bottom->next_di = g_slist_append(di_bottom->next_di, di_top);
 
-       srd_dbg("Stacked %s onto %s.", di_top->inst_id, di_bottom->inst_id);
+       srd_dbg("Stacking %s onto %s.", di_top->inst_id, di_bottom->inst_id);
 
        return SRD_OK;
 }
@@ -627,37 +651,6 @@ SRD_API int srd_inst_initial_pins_set_all(struct srd_decoder_inst *di, GArray *i
        return SRD_OK;
 }
 
-static void oldpins_array_seed(struct srd_decoder_inst *di)
-{
-       size_t count;
-       GArray *arr;
-
-       if (!di)
-               return;
-       if (di->old_pins_array)
-               return;
-
-       srd_dbg("%s: Seeding old pins, %s().", di->inst_id, __func__);
-       count = di->dec_num_channels;
-       arr = g_array_sized_new(FALSE, TRUE, sizeof(uint8_t), count);
-       g_array_set_size(arr, count);
-       memset(arr->data, SRD_INITIAL_PIN_SAME_AS_SAMPLE0, count);
-       di->old_pins_array = arr;
-}
-
-static void oldpins_array_free(struct srd_decoder_inst *di)
-{
-       if (!di)
-               return;
-       if (!di->old_pins_array)
-               return;
-
-       srd_dbg("%s: Releasing initial pin state.", di->inst_id);
-
-       g_array_free(di->old_pins_array, TRUE);
-       di->old_pins_array = NULL;
-}
-
 /** @private */
 SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
 {
@@ -667,8 +660,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
        int ret;
        PyGILState_STATE gstate;
 
-       srd_dbg("Calling start() method on protocol decoder instance %s.",
-                       di->inst_id);
+       srd_dbg("Calling start() of instance %s.", di->inst_id);
 
        gstate = PyGILState_Ensure();
 
@@ -1028,9 +1020,9 @@ static gpointer di_thread(gpointer data)
         * "Regular" termination of the decode() method is not expected.
         */
        Py_IncRef(di->py_inst);
-       srd_dbg("%s: Calling decode() method.", di->inst_id);
+       srd_dbg("%s: Calling decode().", di->inst_id);
        py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
-       srd_dbg("%s: decode() method terminated.", di->inst_id);
+       srd_dbg("%s: decode() terminated.", di->inst_id);
 
        if (!py_res)
                di->decoder_state = SRD_ERR;
@@ -1262,7 +1254,7 @@ SRD_PRIV int srd_inst_terminate_reset(struct srd_decoder_inst *di)
         */
        gstate = PyGILState_Ensure();
        if (PyObject_HasAttrString(di->py_inst, "reset")) {
-               srd_dbg("Calling .reset() of instance %s", di->inst_id);
+               srd_dbg("Calling reset() of instance %s", di->inst_id);
                py_ret = PyObject_CallMethod(di->py_inst, "reset", NULL);
                Py_XDECREF(py_ret);
        }