X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=5d76b1cf930f6b0ebff121675034a1b0cb548153;hb=222fdfd526fde6d8450067675679eca6cc5d211b;hp=04f3054cf1deafeb7674e2fda07adc5c7a926fbb;hpb=81b3ce374c3b6d48e5ed321ac7a871ce4248a0bb;p=libsigrok.git

diff --git a/src/output/output.c b/src/output/output.c
index 04f3054c..5d76b1cf 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -156,6 +157,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 +284,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 +303,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;