X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Foutput.c;h=6f02b6806d618321f05476222a856c05fee37cd0;hb=c3d4003710edfe193de072f6032401bcba098672;hp=0a9e7f880689bee89308cd9e30dd4e8b9075fce7;hpb=c1aae90038456a61d0f9313d34e6107c3440d3e7;p=libsigrok.git
diff --git a/src/output/output.c b/src/output/output.c
index 0a9e7f88..6f02b680 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "libsigrok-internal.h"
@@ -37,7 +38,7 @@
* Output module handling.
*
* libsigrok supports several output modules for file formats such as binary,
- * VCD, gnuplot, and so on. It provides an output API that frontends can use.
+ * VCD, csv, and so on. It provides an output API that frontends can use.
* New output modules can be added/implemented in libsigrok without having
* to change the frontends at all.
*
@@ -58,20 +59,20 @@ extern SR_PRIV struct sr_output_module output_ascii;
extern SR_PRIV struct sr_output_module output_binary;
extern SR_PRIV struct sr_output_module output_vcd;
extern SR_PRIV struct sr_output_module output_ols;
-extern SR_PRIV struct sr_output_module output_gnuplot;
extern SR_PRIV struct sr_output_module output_chronovu_la8;
extern SR_PRIV struct sr_output_module output_csv;
extern SR_PRIV struct sr_output_module output_analog;
extern SR_PRIV struct sr_output_module output_srzip;
extern SR_PRIV struct sr_output_module output_wav;
-/* @endcond */
+extern SR_PRIV struct sr_output_module output_wavedrom;
+extern SR_PRIV struct sr_output_module output_null;
+/** @endcond */
static const struct sr_output_module *output_module_list[] = {
&output_ascii,
&output_binary,
&output_bits,
&output_csv,
- &output_gnuplot,
&output_hex,
&output_ols,
&output_vcd,
@@ -79,6 +80,8 @@ static const struct sr_output_module *output_module_list[] = {
&output_analog,
&output_srzip,
&output_wav,
+ &output_wavedrom,
+ &output_null,
NULL,
};
@@ -283,7 +286,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;
}
@@ -301,7 +305,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;