Doxyfile: Set version to "unreleased development snapshot".

[libsigrokdecode.git] / controller.c

diff --git a/controller.c b/controller.c
index c9825b95cfc70c8fd6448f9001e851bd6957be3b..2f766651864c2a34f8691797a2beb15b01da0246 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -112,10 +112,10 @@ extern SRD_PRIV PyTypeObject srd_logic_type;
  * This initializes the Python interpreter, and creates and initializes
  * a "sigrokdecode" Python module.
  *
- * Then, it searches for sigrok protocol decoder files (*.py) in the
- * "decoders" subdirectory of the the sigrok installation directory.
+ * Then, it searches for sigrok protocol decoders in the "decoders"
+ * subdirectory of the the libsigrokdecode installation directory.
  * All decoders that are found are loaded into memory and added to an
- * internal list of decoders, which can be queried via srd_decoders_list().
+ * internal list of decoders, which can be queried via srd_decoder_list().
  *
  * The caller is responsible for calling the clean-up function srd_exit(),
  * which will properly shut down libsigrokdecode and free its allocated memory.
@@ -124,12 +124,12 @@ extern SRD_PRIV PyTypeObject srd_logic_type;
  * are not allowed.
  *
  * @param path Path to an extra directory containing protocol decoders
- *             which will be added to the Python sys.path, or NULL.
+ *             which will be added to the Python sys.path. May be NULL.
  *
  * @return SRD_OK upon success, a (negative) error code otherwise.
- *         Upon Python errors, return SRD_ERR_PYTHON. If the sigrok decoders
- *         directory cannot be accessed, return SRD_ERR_DECODERS_DIR.
- *         If not enough memory could be allocated, return SRD_ERR_MALLOC.
+ *         Upon Python errors, SRD_ERR_PYTHON is returned. If the decoders
+ *         directory cannot be accessed, SRD_ERR_DECODERS_DIR is returned.
+ *         If not enough memory could be allocated, SRD_ERR_MALLOC is returned.
  *
  * @since 0.1.0
  */
@@ -229,10 +229,10 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
        srd_dbg("Adding '%s' to module path.", path);
 
        new_path = g_string_sized_new(256);
-       g_string_assign(new_path, g_strdup(path));
+       g_string_assign(new_path, path);
        py_cur_path = PySys_GetObject("path");
        for (i = 0; i < PyList_Size(py_cur_path); i++) {
-               g_string_append(new_path, g_strdup(G_SEARCHPATH_SEPARATOR_S));
+               g_string_append(new_path, G_SEARCHPATH_SEPARATOR_S);
                py_item = PyList_GetItem(py_cur_path, i);
                if (!PyUnicode_Check(py_item))
                        /* Shouldn't happen. */
@@ -240,6 +240,7 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
                if (py_str_as_str(py_item, &item) != SRD_OK)
                        continue;
                g_string_append(new_path, item);
+               g_free(item);
        }
 
        /* Convert to wide chars. */
@@ -401,6 +402,7 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
                 */
                if (PyDict_SetItemString(py_di_options, key, py_optval) == -1)
                        goto err_out;
+               g_free(key);
        }
 
        ret = SRD_OK;
@@ -816,6 +818,7 @@ SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di)
                g_free(pdo);
        }
        g_slist_free(di->pd_output);
+       g_free(di);
 }
 
 /** @private */