X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=srd.c;h=599d190081621357222d815ccf8397ac7c33e9e2;hb=783b54337242e5c40da8ffc0fc18babbcd09bc67;hp=1c7f6f92e59fcb895940a8225477bd50047a9ac9;hpb=e195c025c303e361d0cc5a207f9c9443fb8deced;p=libsigrokdecode.git

diff --git a/srd.c b/srd.c
index 1c7f6f9..599d190 100644
--- a/srd.c
+++ b/srd.c
@@ -25,15 +25,12 @@
 
 /** @cond PRIVATE */
 
-/* session.c */
-extern GSList *sessions;
-extern int max_session_id;
-
-/* decoder.c */
-extern SRD_PRIV GSList *pd_list;
+/* Python module search paths */
+SRD_PRIV GSList *searchpaths = NULL;
 
-/* module_sigrokdecode.c */
-extern PyMODINIT_FUNC PyInit_sigrokdecode(void);
+/* session.c */
+extern SRD_PRIV GSList *sessions;
+extern SRD_PRIV int max_session_id;
 
 /** @endcond */
 
@@ -194,8 +191,8 @@ SRD_API int srd_exit(void)
 		srd_session_destroy((struct srd_session *)l->data);
 
 	srd_decoder_unload_all();
-	g_slist_free(pd_list);
-	pd_list = NULL;
+	g_slist_free_full(searchpaths, g_free);
+	searchpaths = NULL;
 
 	/* Py_Finalize() returns void, any finalization errors are ignored. */
 	Py_Finalize();
@@ -259,18 +256,9 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 	PySys_SetPath(wc_new_path);
 	g_string_free(new_path, TRUE);
 	g_free(wc_new_path);
+	searchpaths = g_slist_append(searchpaths, g_strdup(path));
 
 	return SRD_OK;
 }
 
-/* @private */
-SRD_PRIV gboolean srd_check_init(void)
-{
-	if (max_session_id < 0) {
-		srd_err("Library is not initialized.");
-		return FALSE;
-	} else
-		return TRUE;
-}
-
 /** @} */