X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fhex.c;h=1d4196381d3a706440eb1b52c468c6c20d6e4703;hb=dcc55fe91aadf4396ce4a3b5db2898da39e1a6be;hp=ab4ce2d37cbc3a485652010f6e9cf53d28c6fc4c;hpb=950043c30ecd2a0d1d15a14f0d07f29b06157fc6;p=libsigrok.git

diff --git a/src/output/hex.c b/src/output/hex.c
index ab4ce2d3..1d419638 100644
--- a/src/output/hex.c
+++ b/src/output/hex.c
@@ -29,7 +29,7 @@
 
 struct context {
 	unsigned int num_enabled_channels;
-	int samples_per_line;
+	int spl;
 	int bit_cnt;
 	int spl_cnt;
 	int trigger;
@@ -47,38 +47,15 @@ static int init(struct sr_output *o, GHashTable *options)
 	struct context *ctx;
 	struct sr_channel *ch;
 	GSList *l;
-	GHashTableIter iter;
-	gpointer key, value;
 	unsigned int i, j;
-	uint32_t spl;
 
 	if (!o || !o->sdi)
 		return SR_ERR_ARG;
 
-	spl = DEFAULT_SAMPLES_PER_LINE;
-	if (options) {
-		g_hash_table_iter_init(&iter, options);
-		while (g_hash_table_iter_next(&iter, &key, &value)) {
-			if (!strcmp(key, "width")) {
-				if (!g_variant_is_of_type(value, G_VARIANT_TYPE_UINT32)) {
-					sr_err("Invalid type for 'width' option.");
-					return SR_ERR_ARG;
-				}
-				if (!(spl = g_variant_get_uint32(value))) {
-					sr_err("Invalid width.");
-					return SR_ERR_ARG;
-				}
-			} else {
-				sr_err("Unknown option '%s'.", key);
-				return SR_ERR_ARG;
-			}
-		}
-	}
-
 	ctx = g_malloc0(sizeof(struct context));
 	o->priv = ctx;
 	ctx->trigger = -1;
-	ctx->samples_per_line = spl;
+	ctx->spl = g_variant_get_uint32(g_hash_table_lookup(options, "width"));
 
 	for (l = o->sdi->channels; l; l = l->next) {
 		ch = l->data;
@@ -198,7 +175,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 					ctx->sample_buf[j] = 0;
 				}
 
-				if (ctx->spl_cnt == ctx->samples_per_line) {
+				if (ctx->spl_cnt == ctx->spl) {
 					/* Flush line buffers. */
 					g_string_append_len(*out, ctx->lines[j]->str, ctx->lines[j]->len);
 					g_string_append_c(*out, '\n');
@@ -210,7 +187,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 					g_string_printf(ctx->lines[j], "%s:", ctx->channel_names[j]);
 				}
 			}
-			if (ctx->spl_cnt == ctx->samples_per_line)
+			if (ctx->spl_cnt == ctx->spl)
 				/* Line buffers were already flushed. */
 				ctx->spl_cnt = 0;
 		}