serial: Make serial device event sources more robust

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

diff --git a/src/output/output.c b/src/output/output.c
index 04f3054cf1deafeb7674e2fda07adc5c7a926fbb..df22b22233720cc349b4bb88cc0c5b12ee33913a 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -156,6 +156,18 @@ SR_API const char *const *sr_output_extensions_get(
        return omod->exts;
 }
 
+/*
+ * Checks whether a given flag is set.
+ *
+ * @see sr_output_flag
+ * @since 0.4.0
+ */
+SR_API gboolean sr_output_test_flag(const struct sr_output_module *omod,
+               uint64_t flag)
+{
+       return (flag & omod->flags);
+}
+
 /**
  * Return the output module with the specified ID, or NULL if no module
  * with that id is found.
@@ -271,7 +283,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
                                /* Pass option along. */
                                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(op);
                                        return NULL;
                                }
@@ -289,7 +302,8 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
                        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("Output module '%s' has no option '%s'", omod->id, key);
+                                       sr_err("Output module '%s' has no option '%s'",
+                                               omod->id, (char *)key);
                                        g_hash_table_destroy(new_opts);
                                        g_free(op);
                                        return NULL;