From: Uwe Hermann Date: Sat, 3 May 2014 21:56:50 +0000 (+0200) Subject: Move srd_check_init() to decoder.c and make it static. X-Git-Tag: libsigrokdecode-0.3.0~15 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=f6527cc4f7625eb5283eee5392312ad5df70e0f3;hp=2060510aaafcc7eb27fac071334b4f8aa1f3cab2 Move srd_check_init() to decoder.c and make it static. The function srd_check_init() is only used in decoder.c. --- diff --git a/decoder.c b/decoder.c index 4b32638..79ba8ef 100644 --- a/decoder.c +++ b/decoder.c @@ -47,12 +47,22 @@ extern GSList *searchpaths; /* session.c */ extern GSList *sessions; +extern int max_session_id; /* module_sigrokdecode.c */ extern SRD_PRIV PyObject *mod_sigrokdecode; /** @endcond */ +static gboolean srd_check_init(void) +{ + if (max_session_id < 0) { + srd_err("Library is not initialized."); + return FALSE; + } else + return TRUE; +} + /** * Returns the list of supported/loaded protocol decoders. * diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h index 1fe19ca..f386cd7 100644 --- a/libsigrokdecode-internal.h +++ b/libsigrokdecode-internal.h @@ -37,7 +37,6 @@ struct srd_session { /* srd.c */ SRD_PRIV int srd_decoder_searchpath_add(const char *path); -SRD_PRIV gboolean srd_check_init(void); /* session.c */ SRD_PRIV int session_is_valid(struct srd_session *sess); diff --git a/srd.c b/srd.c index 9d04a8e..61280ef 100644 --- a/srd.c +++ b/srd.c @@ -261,14 +261,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; -} - /** @} */