X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=68cfe0aa0b786adcd2eca26628cda2e58efaa667;hp=a6c16f69a800742621a4137635ac34354ddbe6c9;hb=348118b732231daf9d9e4b3f7c80e7939f3eb0ca;hpb=ea81b49a3ca4fff4994693d30045d51b86181e32

diff --git a/srd.c b/srd.c
index a6c16f6..68cfe0a 100644
--- a/srd.c
+++ b/srd.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include "config.h"
 #include <glib.h>
 
@@ -29,14 +29,8 @@
 SRD_PRIV GSList *searchpaths = NULL;
 
 /* session.c */
-extern GSList *sessions;
-extern int max_session_id;
-
-/* decoder.c */
-extern SRD_PRIV GSList *pd_list;
-
-/* module_sigrokdecode.c */
-extern PyMODINIT_FUNC PyInit_sigrokdecode(void);
+extern SRD_PRIV GSList *sessions;
+extern SRD_PRIV int max_session_id;
 
 /** @endcond */
 
@@ -68,7 +62,7 @@ extern PyMODINIT_FUNC PyInit_sigrokdecode(void);
  *
  * @section sec_mailinglists Mailing lists
  *
- * There are two mailing lists for sigrok/libsigrokdecode: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a> and <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-commits">sigrok-commits</a>.
+ * There is one mailing list for sigrok/libsigrokdecode: <a href="https://lists.sourceforge.net/lists/listinfo/sigrok-devel">sigrok-devel</a>.
  *
  * @section sec_irc IRC
  *
@@ -254,10 +248,7 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *path)
 
 	/* Convert to wide chars. */
 	wc_len = sizeof(wchar_t) * (new_path->len + 1);
-	if (!(wc_new_path = g_try_malloc(wc_len))) {
-		srd_dbg("malloc failed");
-		return SRD_ERR_MALLOC;
-	}
+	wc_new_path = g_malloc(wc_len);
 	mbstowcs(wc_new_path, new_path->str, wc_len);
 	PySys_SetPath(wc_new_path);
 	g_string_free(new_path, TRUE);
@@ -267,14 +258,4 @@ SRD_PRIV int srd_decoder_searchpath_add(const char *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;
-}
-
 /** @} */