X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=333e6e49053e24c0555e2443d75b9a748ca4b63d;hp=f0e2a7f8ebccb10073a44ecb8968e0a008336294;hb=ee639fb40fa43aa3553ef0229def9bcdb8338c2b;hpb=f0f54487c6a146af523d6eb19fcce63422e3f0f1 diff --git a/parsers.c b/parsers.c index f0e2a7f..333e6e4 100644 --- a/parsers.c +++ b/parsers.c @@ -17,14 +17,12 @@ * along with this program. If not, see . */ -#include "sigrok-cli.h" #include #include #include #include #include - -extern struct sr_context *sr_ctx; +#include "sigrok-cli.h" struct sr_channel *find_channel(GSList *channellist, const char *channelname) { @@ -410,12 +408,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;