log: Enable varargs format warnings

[libsigrokdecode.git] / libsigrokdecode-internal.h

diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 600b9fd1e186f76b31212b28802add2a50c0313e..bcf6bb75b243a027a727db752a3af97f8240f392 100644 (file)
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -22,43 +22,79 @@
 #ifndef LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H
 #define LIBSIGROKDECODE_LIBSIGROKDECODE_INTERNAL_H
 
+#include <Python.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 
-/*--- controller.c ----------------------------------------------------------*/
+/* Custom Python types: */
 
+typedef struct {
+       PyObject_HEAD
+       struct srd_decoder_inst *di;
+       uint64_t start_samplenum;
+       unsigned int itercnt;
+       uint8_t *inbuf;
+       uint64_t inbuflen;
+       PyObject *sample;
+} srd_logic;
+
+struct srd_session {
+       int session_id;
+
+       /* List of decoder instances. */
+       GSList *di_list;
+
+       /* List of frontend callbacks to receive decoder output. */
+       GSList *callbacks;
+};
+
+/* srd.c */
 SRD_PRIV int srd_decoder_searchpath_add(const char *path);
-SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
-                                                      const PyObject *obj);
-SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
-SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
-                            const struct srd_decoder_inst *dec,
-                            const uint8_t *inbuf, uint64_t inbuflen);
-SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
-SRD_PRIV void srd_inst_free_all(GSList *stack);
-SRD_PRIV struct srd_pd_callback *srd_pd_output_callback_find(int output_type);
-SRD_PRIV int srd_inst_pd_output_add(struct srd_decoder_inst *di,
-                                   int output_type, const char *output_id);
 
-/*--- exception.c -----------------------------------------------------------*/
+/* session.c */
+SRD_PRIV int session_is_valid(struct srd_session *sess);
+SRD_PRIV struct srd_pd_callback *srd_pd_output_callback_find(struct srd_session *sess,
+               int output_type);
 
-SRD_PRIV void srd_exception_catch(const char *format, ...);
+/* instance.c */
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj( const GSList *stack,
+               const PyObject *obj);
+SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di);
+SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
+               uint64_t start_samplenum, uint64_t end_samplenum,
+               const uint8_t *inbuf, uint64_t inbuflen, uint64_t unitsize);
+SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
+SRD_PRIV void srd_inst_free_all(struct srd_session *sess, GSList *stack);
 
-/*--- log.c -----------------------------------------------------------------*/
+/* log.c */
+#if defined(G_OS_WIN32) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+/*
+ * On MinGW, we need to specify the gnu_printf format flavor or GCC
+ * will assume non-standard Microsoft printf syntax.
+ */
+SRD_PRIV int srd_log(int loglevel, const char *format, ...)
+               __attribute__((__format__ (__gnu_printf__, 2, 3)));
+#else
+SRD_PRIV int srd_log(int loglevel, const char *format, ...) G_GNUC_PRINTF(2, 3);
+#endif
 
-SRD_PRIV int srd_log(int loglevel, const char *format, ...);
-SRD_PRIV int srd_spew(const char *format, ...);
-SRD_PRIV int srd_dbg(const char *format, ...);
-SRD_PRIV int srd_info(const char *format, ...);
-SRD_PRIV int srd_warn(const char *format, ...);
-SRD_PRIV int srd_err(const char *format, ...);
+#define srd_spew(...)  srd_log(SRD_LOG_SPEW, __VA_ARGS__)
+#define srd_dbg(...)   srd_log(SRD_LOG_DBG,  __VA_ARGS__)
+#define srd_info(...)  srd_log(SRD_LOG_INFO, __VA_ARGS__)
+#define srd_warn(...)  srd_log(SRD_LOG_WARN, __VA_ARGS__)
+#define srd_err(...)   srd_log(SRD_LOG_ERR,  __VA_ARGS__)
 
-/*--- util.c ----------------------------------------------------------------*/
+/* 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);
+        char **outstr);
 SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
-                               char **outstr);
+        char **outstr);
 SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr);
-SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr);
+SRD_PRIV int py_strseq_to_char(const PyObject *py_strseq, char ***outstr);
+
+/* exception.c */
+SRD_PRIV void srd_exception_catch(const char *format, ...);
 
 #endif