X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=b152e0c1637a82388821bad512d83d80200b637b;hp=9d04a8e1d110307a221420d40a533f16ae7f83d7;hb=d8d409590ce21116d85800c0eb8be287817a0eed;hpb=2060510aaafcc7eb27fac071334b4f8aa1f3cab2
diff --git a/srd.c b/srd.c
index 9d04a8e..b152e0c 100644
--- a/srd.c
+++ b/srd.c
@@ -18,9 +18,9 @@
* along with this program. If not, see .
*/
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
-#include "config.h"
+#include
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
#include
/** @cond PRIVATE */
@@ -29,8 +29,8 @@
SRD_PRIV GSList *searchpaths = NULL;
/* session.c */
-extern GSList *sessions;
-extern int max_session_id;
+extern SRD_PRIV GSList *sessions;
+extern SRD_PRIV int max_session_id;
/** @endcond */
@@ -62,7 +62,7 @@ extern int max_session_id;
*
* @section sec_mailinglists Mailing lists
*
- * There are two mailing lists for sigrok/libsigrokdecode: sigrok-devel and sigrok-commits.
+ * There is one mailing list for sigrok/libsigrokdecode: sigrok-devel.
*
* @section sec_irc IRC
*
@@ -224,51 +224,28 @@ SRD_API int srd_exit(void)
SRD_PRIV int srd_decoder_searchpath_add(const char *path)
{
PyObject *py_cur_path, *py_item;
- GString *new_path;
- int wc_len, i;
- wchar_t *wc_new_path;
- char *item;
srd_dbg("Adding '%s' to module path.", path);
- new_path = g_string_sized_new(256);
- 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_SEARCHPATH_SEPARATOR_S);
- py_item = PyList_GetItem(py_cur_path, i);
- if (!PyUnicode_Check(py_item))
- /* Shouldn't happen. */
- continue;
- if (py_str_as_str(py_item, &item) != SRD_OK)
- continue;
- g_string_append(new_path, item);
- g_free(item);
- }
+ if (!py_cur_path)
+ return SRD_ERR_PYTHON;
- /* 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;
+ py_item = PyUnicode_FromString(path);
+ if (!py_item) {
+ srd_exception_catch("Failed to create Unicode object");
+ return SRD_ERR_PYTHON;
+ }
+ if (PyList_Insert(py_cur_path, 0, py_item) < 0) {
+ srd_exception_catch("Failed to insert path element");
+ Py_DECREF(py_item);
+ return SRD_ERR_PYTHON;
}
- mbstowcs(wc_new_path, new_path->str, wc_len);
- PySys_SetPath(wc_new_path);
- g_string_free(new_path, TRUE);
- g_free(wc_new_path);
- searchpaths = g_slist_append(searchpaths, g_strdup(path));
+ Py_DECREF(py_item);
- return SRD_OK;
-}
+ searchpaths = g_slist_prepend(searchpaths, g_strdup(path));
-/** @private */
-SRD_PRIV gboolean srd_check_init(void)
-{
- if (max_session_id < 0) {
- srd_err("Library is not initialized.");
- return FALSE;
- } else
- return TRUE;
+ return SRD_OK;
}
/** @} */