srd: no public API functions use python-specific arguments now

diff --git a/controller.c b/controller.c
index 8b9f793750bc7c9658c5e7e3fd51fcdd0ea3d105..07016740a9cab4afe054ebe8272c1b352c78c7cf 100644 (file)
--- a/controller.c
+++ b/controller.c
@@ -526,7 +526,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id)
  *
  * @return Pointer to struct srd_decoder_inst, or NULL if not found.
  */
-SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
                                                              PyObject *obj)
 {
        GSList *l;
@@ -544,7 +544,7 @@ SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
        return di;
 }
 
-SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
+SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args)
 {
        PyObject *py_name, *py_res;
        GSList *l;

diff --git a/sigrokdecode-internal.h b/sigrokdecode-internal.h
index 60914c312c689a38ce63d4e1a82ef6149c32a737..56d36917f7da5c2dca55e28a93e37259e5daf1a2 100644 (file)
--- a/sigrokdecode-internal.h
+++ b/sigrokdecode-internal.h
@@ -22,8 +22,6 @@
 #define LIBSIGROKDECODE_SIGROKDECODE_INTERNAL_H
 
 #include "sigrokdecode.h"
-// #include <stdarg.h>
-// #include <glib.h>
 
 /*--- Macros ----------------------------------------------------------------*/
 
@@ -59,5 +57,7 @@ SRD_PRIV int py_attr_as_str(PyObject *py_obj, const char *attr, char **outstr);
 SRD_PRIV int py_dictitem_as_str(PyObject *py_obj, const char *key, char **outstr);
 SRD_PRIV int py_str_as_str(PyObject *py_str, char **outstr);
 SRD_PRIV int py_strlist_to_char(PyObject *py_strlist, char ***outstr);
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
+                                                             PyObject *obj);
 
 #endif

diff --git a/sigrokdecode.h b/sigrokdecode.h
index ae4ec81650b6c89c87d977f8ea19e7e87ea66152..0558a4f51fd63776dc472a6ee5dab4797bec1c9f 100644 (file)
--- a/sigrokdecode.h
+++ b/sigrokdecode.h
@@ -211,9 +211,7 @@ SRD_API struct srd_decoder_inst *srd_inst_new(const char *id,
 SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
                               struct srd_decoder_inst *di_to);
 SRD_API struct srd_decoder_inst *srd_inst_find_by_id(char *inst_id);
-SRD_API struct srd_decoder_inst *srd_inst_find_by_obj(GSList *stack,
-                                                             PyObject *obj);
-SRD_API int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
+SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
 SRD_API int srd_inst_decode(uint64_t start_samplenum,
                                struct srd_decoder_inst *dec,
                                uint8_t *inbuf, uint64_t inbuflen);