X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=c9e49990fab91c5707e9a15ca9e0032122f93664;hb=4fb0a5f8a022b4b551f0dcac5c458c7108ea613c;hp=787d75c749b4c69f5bd35f4f2b658929bf003cab;hpb=499c85dce538b5bb270bce62ba6c6911254f58a4;p=libsigrok.git

diff --git a/src/output/output.c b/src/output/output.c
index 787d75c7..c9e49990 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ 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 */
 
@@ -74,6 +75,7 @@ static const struct sr_output_module *output_module_list[] = {
 	&output_vcd,
 	&output_chronovu_la8,
 	&output_analog,
+	&output_srzip,
 	&output_wav,
 	NULL,
 };
@@ -93,14 +95,14 @@ SR_API const struct sr_output_module **sr_output_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_id_get(const struct sr_output_module *o)
+SR_API const char *sr_output_id_get(const struct sr_output_module *omod)
 {
-	if (!o) {
+	if (!omod) {
 		sr_err("Invalid output module NULL!");
 		return NULL;
 	}
 
-	return o->id;
+	return omod->id;
 }
 
 /**
@@ -108,14 +110,14 @@ SR_API const char *sr_output_id_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_name_get(const struct sr_output_module *o)
+SR_API const char *sr_output_name_get(const struct sr_output_module *omod)
 {
-	if (!o) {
+	if (!omod) {
 		sr_err("Invalid output module NULL!");
 		return NULL;
 	}
 
-	return o->name;
+	return omod->name;
 }
 
 /**
@@ -123,14 +125,33 @@ SR_API const char *sr_output_name_get(const struct sr_output_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_output_description_get(const struct sr_output_module *o)
+SR_API const char *sr_output_description_get(const struct sr_output_module *omod)
 {
-	if (!o) {
+	if (!omod) {
 		sr_err("Invalid output module NULL!");
 		return NULL;
 	}
 
-	return o->desc;
+	return omod->desc;
+}
+
+/**
+ * Returns the specified output module's file extensions typical for the file
+ * format, as a NULL terminated array, or returns a NULL pointer if there is
+ * no preferred extension.
+ * @note these are a suggestions only.
+ *
+ * @since 0.4.0
+ */
+SR_API const char *const *sr_output_extensions_get(
+		const struct sr_output_module *omod)
+{
+	if (!omod) {
+		sr_err("Invalid output module NULL!");
+		return NULL;
+	}
+
+	return omod->exts;
 }
 
 /**
@@ -160,19 +181,19 @@ SR_API const struct sr_output_module *sr_output_find(char *id)
  *
  * @since 0.4.0
  */
-SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *o)
+SR_API const struct sr_option **sr_output_options_get(const struct sr_output_module *omod)
 {
 	const struct sr_option *mod_opts, **opts;
 	int size, i;
 
-	if (!o || !o->options)
+	if (!omod || !omod->options)
 		return NULL;
 
-	mod_opts = o->options();
+	mod_opts = omod->options();
 
-	for (size = 1; mod_opts[size].id; size++)
+	for (size = 0; mod_opts[size].id; size++)
 		;
-	opts = g_malloc(size * sizeof(struct sr_option *));
+	opts = g_malloc((size + 1) * sizeof(struct sr_option *));
 
 	for (i = 0; i < size; i++)
 		opts[i] = &mod_opts[i];
@@ -221,7 +242,7 @@ 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 *o,
+SR_API const struct sr_output *sr_output_new(const struct sr_output_module *omod,
 		GHashTable *options, const struct sr_dev_inst *sdi)
 {
 	struct sr_output *op;
@@ -233,13 +254,13 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 	int i;
 
 	op = g_malloc(sizeof(struct sr_output));
-	op->module = o;
+	op->module = omod;
 	op->sdi = sdi;
 
 	new_opts = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
 			(GDestroyNotify)g_variant_unref);
-	if (o->options) {
-		mod_opts = o->options();
+	if (omod->options) {
+		mod_opts = omod->options();
 		for (i = 0; mod_opts[i].id; i++) {
 			if (options && g_hash_table_lookup_extended(options,
 					mod_opts[i].id, &key, &value)) {
@@ -264,7 +285,7 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 			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'", o->id, key);
+					sr_err("Output module '%s' has no option '%s'", omod->id, key);
 					g_hash_table_destroy(new_opts);
 					g_free(op);
 					return NULL;
@@ -274,7 +295,6 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 	}
 
 	if (op->module->init && op->module->init(op, new_opts) != SR_OK) {
-		g_hash_table_destroy(new_opts);
 		g_free(op);
 		op = NULL;
 	}