X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=srd.c;h=68cfe0aa0b786adcd2eca26628cda2e58efaa667;hp=61280ef41d7f4f838472aa2f9ff98ec672305520;hb=c357abd198bd195cb9ea015130dc76c8c7a33651;hpb=f6527cc4f7625eb5283eee5392312ad5df70e0f3 diff --git a/srd.c b/srd.c index 61280ef..68cfe0a 100644 --- a/srd.c +++ b/srd.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#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 @@ -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 * @@ -248,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);