From: Uwe Hermann <redacted>
Date: Thu, 30 Jan 2014 23:13:32 +0000 (+0100)
Subject: srd_inst_probe_set_all: Error out upon missing required probes.
X-Git-Tag: libsigrokdecode-0.3.0~138
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=9bf7f71c8e29328bda5689d79b412cc0dde9fbe9;p=libsigrokdecode.git

srd_inst_probe_set_all: Error out upon missing required probes.
---

diff --git a/instance.c b/instance.c
index ab813e6..594f144 100644
--- a/instance.c
+++ b/instance.c
@@ -305,6 +305,16 @@ SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
 		        (i < num_required_probes) ? "required" : "optional");
 	}
 
+	/* Report an error if not all required probes were specified. */
+	for (i = 0; i < num_required_probes; i++) {
+		if (new_probemap[i] != -1)
+			continue;
+		p = g_slist_nth(di->decoder->probes, i)->data;
+		srd_err("Required probe '%s' (index %d) was not specified.",
+			p->id, i);
+		return SRD_ERR;
+	}
+
 	g_free(di->dec_probemap);
 	di->dec_probemap = new_probemap;