X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Foutput.c;h=efb205c68192d8d020f590c86b04841cc9e3c886;hb=76f0fa5dfb6efe7afdaa3a1101d3d894840471cc;hp=5e2d409d525ddc0c9fee24eab8392504548124ba;hpb=e00b3f5897d9b5b85b552f9f8da7684229b9bdfc;p=libsigrok.git
diff --git a/src/output/output.c b/src/output/output.c
index 5e2d409d..efb205c6 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -17,8 +17,9 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
/** @cond PRIVATE */
@@ -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,7 +59,6 @@ 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;
@@ -71,7 +71,6 @@ static const struct sr_output_module *output_module_list[] = {
&output_binary,
&output_bits,
&output_csv,
- &output_gnuplot,
&output_hex,
&output_ols,
&output_vcd,
@@ -156,6 +155,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.
@@ -245,7 +256,8 @@ SR_API void sr_output_options_free(const struct sr_option **options)
* @since 0.4.0
*/
SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
- GHashTable *options, const struct sr_dev_inst *sdi)
+ GHashTable *options, const struct sr_dev_inst *sdi,
+ const char *filename)
{
struct sr_output *op;
const struct sr_option *mod_opts;
@@ -258,6 +270,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod
op = g_malloc(sizeof(struct sr_output));
op->module = omod;
op->sdi = sdi;
+ op->filename = g_strdup(filename);
new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
(GDestroyNotify)g_variant_unref);
@@ -269,7 +282,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;
}
@@ -287,7 +301,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;
@@ -335,6 +350,7 @@ SR_API int sr_output_free(const struct sr_output *o)
ret = SR_OK;
if (o->module->cleanup)
ret = o->module->cleanup((struct sr_output *)o);
+ g_free((char *)o->filename);
g_free((gpointer)o);
return ret;