X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=5ec655f78ad3dce8a05f01186a2a7ec61febb437;hp=ee992712bd126fb261fea9991e9e529dba260fb0;hb=c5e0e72ee3bcc799d1510c9fb91b3a0073766b2a;hpb=c6fa2b2e53d04462bd9fd0033b99e9165323762a

diff --git a/parsers.c b/parsers.c
index ee99271..5ec655f 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,14 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-
-extern struct sr_context *sr_ctx;
+#include "sigrok-cli.h"
 
 struct sr_channel *find_channel(GSList *channellist, const char *channelname)
 {
@@ -67,10 +66,12 @@ GSList *parse_channelstring(struct sr_dev_inst *sdi, const char *channelstring)
 			break;
 		}
 		if (strchr(tokens[i], '-')) {
-			/* A range of channels in the form a-b. This will only work
+			/*
+			 * A range of channels in the form a-b. This will only work
 			 * if the channels are named as numbers -- so every channel
 			 * in the range must exist as a channel name string in the
-			 * device. */
+			 * device.
+			 */
 			range = g_strsplit(tokens[i], "-", 2);
 			if (!range[0] || !range[1] || range[2]) {
 				/* Need exactly two arguments. */
@@ -200,7 +201,7 @@ int parse_triggerstring(const struct sr_dev_inst *sdi, const char *s,
 	driver = sr_dev_inst_driver_get(sdi);
 	channels = sr_dev_inst_channels_get(sdi);
 
-	if (sr_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
+	if (maybe_config_list(driver, sdi, NULL, SR_CONF_TRIGGER_MATCH,
 			&gvar) != SR_OK) {
 		g_critical("Device doesn't support any triggers.");
 		return FALSE;
@@ -408,12 +409,15 @@ int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
 	int i;
 	char *drvname;
 
+	if (!arg)
+		return FALSE;
+
 	drvargs = parse_generic_arg(arg, TRUE);
 
 	drvname = g_strdup(g_hash_table_lookup(drvargs, "sigrok_key"));
 	g_hash_table_remove(drvargs, "sigrok_key");
 	*driver = NULL;
-	drivers = sr_driver_list();
+	drivers = sr_driver_list(sr_ctx);
 	for (i = 0; drivers[i]; i++) {
 		if (strcmp(drivers[i]->name, drvname))
 			continue;
@@ -447,4 +451,3 @@ int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
 
 	return TRUE;
 }
-