Fix log varargs bugs indicated by -Wformat

[libsigrok.git] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index b078f5a6bf4febac814d9b0375243ad3f2271869..9bae0970a7ea4eb5446d7d7d7c70e40935ffe40a 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -233,7 +233,7 @@ SR_API void sr_input_options_free(const struct sr_option **options)
  *
  * @param imod The input module to use. Must not be NULL.
  * @param options GHashTable consisting of keys corresponding with
- * the module options \c id field. The values should be GVariant
+ * the module options @c id field. The values should be GVariant
  * pointers with sunk references, of the same GVariantType as the option's
  * default value.
  *
@@ -263,7 +263,8 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
                                /* Option not given: insert the default value. */
                                gvt = g_variant_get_type(mod_opts[i].def);
                                if (!g_variant_is_of_type(value, gvt)) {
-                                       sr_err("Invalid type for '%s' option.", key);
+                                       sr_err("Invalid type for '%s' option.",
+                                               (char *)key);
                                        g_free(in);
                                        return NULL;
                                }
@@ -281,7 +282,8 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
                        g_hash_table_iter_init(&iter, options);
                        while (g_hash_table_iter_next(&iter, &key, &value)) {
                                if (!g_hash_table_lookup(new_opts, key)) {
-                                       sr_err("Input module '%s' has no option '%s'", imod->id, key);
+                                       sr_err("Input module '%s' has no option '%s'",
+                                               imod->id, (char *)key);
                                        g_hash_table_destroy(new_opts);
                                        g_free(in);
                                        return NULL;
@@ -431,7 +433,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
        }
 
        if (stat(filename, &st) < 0) {
-               sr_err("%s", strerror(errno));
+               sr_err("%s", g_strerror(errno));
                return SR_ERR_ARG;
        }
 
@@ -471,7 +473,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
                                                GINT_TO_POINTER(st.st_size));
                        } else if (mitem == SR_INPUT_META_HEADER) {
                                if ((fd = open(filename, O_RDONLY)) < 0) {
-                                       sr_err("%s", strerror(errno));
+                                       sr_err("%s", g_strerror(errno));
                                        return SR_ERR;
                                }
                                size = read(fd, header_buf->str, 128);
@@ -479,7 +481,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
                                close(fd);
                                if (size <= 0) {
                                        g_string_free(header_buf, TRUE);
-                                       sr_err("%s", strerror(errno));
+                                       sr_err("%s", g_strerror(errno));
                                        return SR_ERR;
                                }
                                g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
@@ -549,7 +551,8 @@ SR_API struct sr_dev_inst *sr_input_dev_inst_get(const struct sr_input *in)
  */
 SR_API int sr_input_send(const struct sr_input *in, GString *buf)
 {
-       sr_spew("Sending %d bytes to %s module.", buf->len, in->module->id);
+       sr_spew("Sending %" G_GSIZE_FORMAT " bytes to %s module.",
+               buf->len, in->module->id);
        return in->module->receive((struct sr_input *)in, buf);
 }
 
@@ -583,7 +586,8 @@ SR_API void sr_input_free(const struct sr_input *in)
                sr_dev_inst_free(in->sdi);
        if (in->buf->len > 64) {
                /* That seems more than just some sub-unitsize leftover... */
-               sr_warn("Found %d unprocessed bytes at free time.", in->buf->len);
+               sr_warn("Found %" G_GSIZE_FORMAT
+                       " unprocessed bytes at free time.", in->buf->len);
        }
        g_string_free(in->buf, TRUE);
        g_free(in->priv);