Fix warnings exposed by -Wmissing-prototypes.

diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 898ba045ac741bdfd381c9325438ab167ebcf601..1fe19ca1ae22158d8aa224dcc9bd02010f190bb3 100644 (file)
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -62,6 +62,9 @@ SRD_PRIV int srd_info(const char *format, ...);
 SRD_PRIV int srd_warn(const char *format, ...);
 SRD_PRIV int srd_err(const char *format, ...);
 
 SRD_PRIV int srd_warn(const char *format, ...);
 SRD_PRIV int srd_err(const char *format, ...);
 

+/* module_sigrokdecode.c */
+PyMODINIT_FUNC PyInit_sigrokdecode(void);
+

 /* util.c */
 SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
         char **outstr);
 /* util.c */
 SRD_PRIV int py_attr_as_str(const PyObject *py_obj, const char *attr,
         char **outstr);

diff --git a/session.c b/session.c
index 84c38a6a05174cd559d35fe89cc41563d5b1a88e..c073c80e653cdac0ecfeea4fff8431a7b46d887a 100644 (file)
--- a/session.c
+++ b/session.c
@@ -125,8 +125,7 @@ SRD_API int srd_session_start(struct srd_session *sess)
        return ret;
 }
 
        return ret;
 }
 

-/** @private */
-SRD_PRIV int srd_inst_send_meta(struct srd_decoder_inst *di, int key,
+static int srd_inst_send_meta(struct srd_decoder_inst *di, int key,

                GVariant *data)
 {
        PyObject *py_ret;
                GVariant *data)
 {
        PyObject *py_ret;

diff --git a/srd.c b/srd.c
index a6c16f69a800742621a4137635ac34354ddbe6c9..f5b885fecc8008ffdab72b81c92407e878a7058c 100644 (file)
--- a/srd.c
+++ b/srd.c
@@ -35,9 +35,6 @@ extern int max_session_id;
 /* decoder.c */
 extern SRD_PRIV GSList *pd_list;
 
 /* decoder.c */
 extern SRD_PRIV GSList *pd_list;
 

-/* module_sigrokdecode.c */
-extern PyMODINIT_FUNC PyInit_sigrokdecode(void);
-

 /** @endcond */
 
 /**
 /** @endcond */
 
 /**

diff --git a/tests/runtc.c b/tests/runtc.c
index b891b3b026f66837088270e5e4698eb01b465c09..ab1f5e9ad1a99ec5199cb327bee2624c1ef709d5 100644 (file)
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -65,7 +65,7 @@ struct output {
 };
 
 
 };
 
 

-void logmsg(char *prefix, FILE *out, const char *format, va_list args)
+static void logmsg(char *prefix, FILE *out, const char *format, va_list args)

 {
        if (prefix)
                fprintf(out, "%s", prefix);
 {
        if (prefix)
                fprintf(out, "%s", prefix);


@@ -73,7 +73,7 @@ void logmsg(char *prefix, FILE *out, const char *format, va_list args)
        fprintf(out, "\n");
 }
 
        fprintf(out, "\n");
 }
 

-void DBG(const char *format, ...)
+static void DBG(const char *format, ...)

 {
        va_list args;
 
 {
        va_list args;
 


@@ -84,7 +84,7 @@ void DBG(const char *format, ...)
        va_end(args);
 }
 
        va_end(args);
 }
 

-void ERR(const char *format, ...)
+static void ERR(const char *format, ...)

 {
        va_list args;
 
 {
        va_list args;
 


@@ -93,7 +93,7 @@ void ERR(const char *format, ...)
        va_end(args);
 }
 
        va_end(args);
 }
 

-int sr_log(void *cb_data, int loglevel, const char *format, va_list args)
+static int sr_log(void *cb_data, int loglevel, const char *format, va_list args)

 {
        (void)cb_data;
 
 {
        (void)cb_data;
 


@@ -105,7 +105,7 @@ int sr_log(void *cb_data, int loglevel, const char *format, va_list args)
        return SRD_OK;
 }
 
        return SRD_OK;
 }
 

-int srd_log(void *cb_data, int loglevel, const char *format, va_list args)
+static int srd_log(void *cb_data, int loglevel, const char *format, va_list args)

 {
        (void)cb_data;
 
 {
        (void)cb_data;
 


@@ -117,7 +117,7 @@ int srd_log(void *cb_data, int loglevel, const char *format, va_list args)
        return SRD_OK;
 }
 
        return SRD_OK;
 }
 

-void usage(char *msg)
+static void usage(char *msg)

 {
        if (msg)
                fprintf(stderr, "%s\n", msg);
 {
        if (msg)
                fprintf(stderr, "%s\n", msg);


@@ -137,7 +137,7 @@ void usage(char *msg)
 /* This is a neutered version of libsigrokdecode's py_str_as_str(). It
  * does no error checking, but then the only strings it processes are
  * generated by Python's repr(), so are known good. */
 /* This is a neutered version of libsigrokdecode's py_str_as_str(). It
  * does no error checking, but then the only strings it processes are
  * generated by Python's repr(), so are known good. */

-char *py_str_as_str(const PyObject *py_str)
+static char *py_str_as_str(const PyObject *py_str)

 {
        PyObject *py_encstr;
        char *str, *outstr;
 {
        PyObject *py_encstr;
        char *str, *outstr;