X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=parsers.c;h=d575dce076c83660a0107d53884b4cade36b8b80;hp=059d33930d6ce373147dce663e8df91171cdb850;hb=426d0cdaa91051c30d45055b3c10662fd392ea5a;hpb=2be182e6437fb082aedca653fdc106d702518db0
diff --git a/parsers.c b/parsers.c
index 059d339..d575dce 100644
--- a/parsers.c
+++ b/parsers.c
@@ -17,15 +17,14 @@
* along with this program. If not, see .
*/
+#include "sigrok-cli.h"
#include
#include
#include
#include
#include
-#include
-#include "sigrok-cli.h"
-static struct sr_probe *find_probe(GSList *probelist, const char *probename)
+struct sr_probe *find_probe(GSList *probelist, const char *probename)
{
struct sr_probe *probe;
GSList *l;
@@ -49,8 +48,8 @@ GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring)
char **tokens, **range, **names, *eptr, str[8];
if (!probestring || !probestring[0])
- /* All probes are enabled by default by the driver. */
- return NULL;
+ /* Use all probes by default. */
+ return g_slist_copy(sdi->probes);
ret = SR_OK;
range = NULL;
@@ -121,6 +120,7 @@ range_fail:
if (!names[0] || (names[1] && names[2])) {
/* Need one or two arguments. */
g_critical("Invalid probe '%s'.", tokens[i]);
+ g_strfreev(names);
ret = SR_ERR;
break;
}
@@ -128,6 +128,7 @@ range_fail:
probe = find_probe(sdi->probes, names[0]);
if (!probe) {
g_critical("unknown probe '%s'.", names[0]);
+ g_strfreev(names);
ret = SR_ERR;
break;
}
@@ -138,8 +139,7 @@ range_fail:
}
probelist = g_slist_append(probelist, probe);
- if (names)
- g_strfreev(names);
+ g_strfreev(names);
}
}