X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=5903c6d7e75b748149218ffa459323f5d8ae804b;hp=68a6a2358dcc0cb13e5e280af987f142ad9fcd68;hb=3a67b032235e719dc4e74f735d1c95ef2d481a33;hpb=1a41642e2cd8ecfa703c45264c522866b4c99f01

diff --git a/srd.c b/srd.c
index 68a6a23..5903c6d 100644
--- a/srd.c
+++ b/srd.c
@@ -105,7 +105,7 @@ static int searchpath_add_xdg_dir(const char *datadir)
 	if (g_file_test(decdir, G_FILE_TEST_IS_DIR))
 		ret = srd_decoder_searchpath_add(decdir);
 	else
-		ret = SRD_OK; /* just ignore non-existing directory */
+		ret = SRD_OK; /* Just ignore non-existing directory. */
 
 	g_free(decdir);
 
@@ -149,8 +149,17 @@ static int print_searchpaths(void)
 	PyObject *py_paths, *py_path, *py_bytes;
 	PyGILState_STATE gstate;
 	GString *s;
+	GSList *l;
 	int i;
 
+	s = g_string_sized_new(500);
+	g_string_append(s, "Protocol decoder search paths:\n");
+	for (l = searchpaths; l; l = l->next)
+		g_string_append_printf(s, " - %s\n", (const char *)l->data);
+	s->str[s->len - 1] = '\0';
+	srd_dbg("%s", s->str);
+	g_string_free(s, TRUE);
+
 	gstate = PyGILState_Ensure();
 
 	py_paths = PySys_GetObject("path");
@@ -158,7 +167,7 @@ static int print_searchpaths(void)
 		goto err;
 
 	s = g_string_sized_new(500);
-	g_string_append(s, "Decoder search paths:\n");
+	g_string_append(s, "Python system search paths:\n");
 	for (i = 0; i < PyList_Size(py_paths); i++) {
 		py_path = PyList_GetItem(py_paths, i);
 		py_bytes = PyUnicode_AsUTF8String(py_path);
@@ -173,17 +182,12 @@ static int print_searchpaths(void)
 	return SRD_OK;
 
 err:
-	srd_err("Unable to query decoder search paths.");
+	srd_err("Unable to query Python system search paths.");
 	PyGILState_Release(gstate);
 
 	return SRD_ERR_PYTHON;
 }
 
-SRD_API GSList *srd_searchpaths_get(void)
-{
-	return g_slist_copy_deep(searchpaths, (GCopyFunc)g_strdup, NULL);
-}
-
 /**
  * Initialize libsigrokdecode.
  *
@@ -236,7 +240,7 @@ SRD_API int srd_init(const char *path)
 	/* Locations relative to the XDG system data directories. */
 	sys_datadirs = g_get_system_data_dirs();
 	for (i = g_strv_length((char **)sys_datadirs); i > 0; i--) {
-		ret = searchpath_add_xdg_dir(sys_datadirs[i-1]);
+		ret = searchpath_add_xdg_dir(sys_datadirs[i - 1]);
 		if (ret != SRD_OK) {
 			Py_Finalize();
 			return ret;
@@ -303,7 +307,8 @@ SRD_API int srd_exit(void)
 {
 	srd_dbg("Exiting libsigrokdecode.");
 
-	g_slist_foreach(sessions, (GFunc)srd_session_destroy, NULL);
+	for (GSList *l = sessions; l; l = l->next)
+		srd_session_destroy(l->data);
 
 	srd_decoder_unload_all();
 	g_slist_free_full(searchpaths, g_free);
@@ -382,4 +387,16 @@ err:
 	return SRD_ERR_PYTHON;
 }
 
+/**
+ * Return the list of protocol decoder search paths.
+ *
+ * @return The list of search paths used when loading protocol decoders.
+ *
+ * @since 0.5.1
+ */
+SRD_API GSList *srd_searchpaths_get(void)
+{
+	return g_slist_copy_deep(searchpaths, (GCopyFunc)g_strdup, NULL);
+}
+
 /** @} */