X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=srd.c;h=35ec5f2e9b7761f8847d957affd0935b2ed39677;hb=bb6f9c500e4119aa9558dfc66ba82bf7ef3772c5;hp=d4ec44beca2a4579d7f3e7054f9095093ce40dd3;hpb=4fde4be1e61ed706e300d3cb24264249b1aef825;p=libsigrokdecode.git
diff --git a/srd.c b/srd.c
index d4ec44b..35ec5f2 100644
--- a/srd.c
+++ b/srd.c
@@ -67,8 +67,8 @@ extern SRD_PRIV int max_session_id;
* @section sec_irc IRC
*
* You can find the sigrok developers in the
- * \#sigrok
- * IRC channel on Freenode.
+ * \#sigrok
+ * IRC channel on Libera.Chat.
*
* @section sec_website Website
*
@@ -172,6 +172,7 @@ static int print_searchpaths(void)
py_path = PyList_GetItem(py_paths, i);
py_bytes = PyUnicode_AsUTF8String(py_path);
g_string_append_printf(s, " - %s\n", PyBytes_AsString(py_bytes));
+ Py_DECREF(py_bytes);
}
s->str[s->len - 1] = '\0';
srd_dbg("%s", s->str);
@@ -269,12 +270,37 @@ SRD_API int srd_init(const char *path)
}
/* Environment variable overrides everything, for debugging. */
+ /*
+ * TODO
+ * Is the comment still applicable and correct or up to date?
+ * This implementation adds paths which were specified by the
+ * env var. Which can shadow files in other locations, or can
+ * extend the set of available decoders. Which need not only
+ * serve for development, it is as beneficial to regular users.
+ * Without shadowing all other files still are found.
+ */
if ((env_path = g_getenv("SIGROKDECODE_DIR"))) {
if ((ret = srd_decoder_searchpath_add(env_path)) != SRD_OK) {
Py_Finalize();
return ret;
}
}
+ env_path = g_getenv("SIGROKDECODE_PATH");
+ if (env_path) {
+ char **dir_list, **dir_iter, *dir_item;
+ dir_list = g_strsplit(env_path, G_SEARCHPATH_SEPARATOR_S, 0);
+ for (dir_iter = dir_list; *dir_iter; dir_iter++) {
+ dir_item = *dir_iter;
+ if (!dir_item || !*dir_item)
+ continue;
+ ret = srd_decoder_searchpath_add(dir_item);
+ if (ret != SRD_OK) {
+ Py_Finalize();
+ return ret;
+ }
+ }
+ g_strfreev(dir_list);
+ }
/* Initialize the Python GIL (this also happens to acquire it). */
PyEval_InitThreads();
@@ -289,6 +315,12 @@ SRD_API int srd_init(const char *path)
return SRD_OK;
}
+static void srd_session_destroy_cb(void *arg, void *ignored)
+{
+ (void)ignored; // Prevent unused warning
+ srd_session_destroy((struct srd_session *)arg);
+}
+
/**
* Shutdown libsigrokdecode.
*
@@ -307,7 +339,9 @@ SRD_API int srd_exit(void)
{
srd_dbg("Exiting libsigrokdecode.");
- g_slist_foreach(sessions, (GFunc)srd_session_destroy, NULL);
+ g_slist_foreach(sessions, srd_session_destroy_cb, NULL);
+ g_slist_free(sessions);
+ sessions = NULL;
srd_decoder_unload_all();
g_slist_free_full(searchpaths, g_free);
@@ -346,8 +380,6 @@ SRD_API int srd_exit(void)
* @return SRD_OK upon success, a (negative) error code otherwise.
*
* @private
- *
- * @since 0.1.0
*/
SRD_PRIV int srd_decoder_searchpath_add(const char *path)
{
@@ -395,7 +427,12 @@ err:
*/
SRD_API GSList *srd_searchpaths_get(void)
{
- return g_slist_copy_deep(searchpaths, (GCopyFunc)g_strdup, NULL);
+ GSList *paths = NULL;
+
+ for (GSList *l = searchpaths; l; l = l->next)
+ paths = g_slist_append(paths, g_strdup(l->data));
+
+ return paths;
}
/** @} */