diff options
| -rw-r--r-- | decoder.c | 4 | ||||
| -rw-r--r-- | exception.c | 4 | ||||
| -rw-r--r-- | type_decoder.c | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -187,8 +187,8 @@ static int get_options(struct srd_decoder *d) return SRD_ERR_PYTHON; } if (!(py_val = PyDict_GetItemString(py_opt, "id"))) { - srd_err("Protocol decoder %s option %d has no " - "id.", d->name); + srd_err("Protocol decoder %s option %zd has no " + "id.", d->name, opt); return SRD_ERR_PYTHON; } o = g_malloc0(sizeof(struct srd_decoder_option)); diff --git a/exception.c b/exception.c index 8f15ff2..96546f7 100644 --- a/exception.c +++ b/exception.c @@ -62,7 +62,7 @@ SRD_PRIV void srd_exception_catch(const char *format, ...) py_str_as_str(py_str, &str); g_string_append(msg, str); Py_DecRef(py_str); - srd_err(msg->str); + srd_err("%s", msg->str); /* Send a more precise error location to srd_dbg(), if we have it. */ if (etb && etb != Py_None) { @@ -75,7 +75,7 @@ SRD_PRIV void srd_exception_catch(const char *format, ...) py_str_as_str(py_str, &tracestr); Py_DecRef(py_str); g_string_printf(msg, "%s in %s: %s", ename, tracestr, str); - srd_dbg(msg->str); + srd_dbg("%s", msg->str); g_free(tracestr); } g_free(str); diff --git a/type_decoder.c b/type_decoder.c index eeafe58..7abdac1 100644 --- a/type_decoder.c +++ b/type_decoder.c @@ -53,7 +53,7 @@ static int convert_annotation(struct srd_decoder_inst *di, PyObject *obj, /* Should have 2 elements. */ if (PyList_Size(obj) != 2) { srd_err("Protocol decoder %s submitted annotation list with " - "%d elements instead of 2", di->decoder->name, + "%zd elements instead of 2", di->decoder->name, PyList_Size(obj)); return SRD_ERR_PYTHON; } @@ -116,7 +116,7 @@ static int convert_binary(struct srd_decoder_inst *di, PyObject *obj, /* Should have 2 elements. */ if (PyTuple_Size(obj) != 2) { srd_err("Protocol decoder %s submitted SRD_OUTPUT_BINARY tuple " - "with %d elements instead of 2", di->decoder->name, + "with %zd elements instead of 2", di->decoder->name, PyList_Size(obj)); return SRD_ERR_PYTHON; } @@ -251,7 +251,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args) case SRD_OUTPUT_PYTHON: for (l = di->next_di; l; l = l->next) { next_di = l->data; - srd_spew("Sending %d-%d to instance %s", + srd_spew("Sending %" PRIu64 "-%" PRIu64 " to instance %s", start_sample, end_sample, next_di->inst_id); if (!(py_res = PyObject_CallMethod( next_di->py_inst, "decode", "KKO", start_sample, |