cli: switch to new <libsigrok/libsigrok.h>

[sigrok-cli.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index 80015f58a8291d9e2cb337aecbce386bf196967d..659bbad88dfca9bf8f4248309829126b4fbb1de3 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include <libsigrok/libsigrok.h>
 #include "sigrok-cli.h"
 
 char **parse_probestring(int max_probes, const char *probestring)
@@ -44,8 +44,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                        range = g_strsplit(tokens[i], "-", 2);
                        if (!range[0] || !range[1] || range[2]) {
                                /* Need exactly two arguments. */
-                               printf("Invalid probe syntax '%s'.\n",
-                                      tokens[i]);
+                               g_critical("Invalid probe syntax '%s'.", tokens[i]);
                                error = TRUE;
                                break;
                        }
@@ -53,8 +52,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                        b = strtol(range[0], NULL, 10);
                        e = strtol(range[1], NULL, 10);
                        if (b < 1 || e > max_probes || b >= e) {
-                               printf("Invalid probe range '%s'.\n",
-                                      tokens[i]);
+                               g_critical("Invalid probe range '%s'.", tokens[i]);
                                error = TRUE;
                                break;
                        }
@@ -67,7 +65,7 @@ char **parse_probestring(int max_probes, const char *probestring)
                } else {
                        tmp = strtol(tokens[i], NULL, 10);
                        if (tmp < 1 || tmp > max_probes) {
-                               printf("Invalid probe %d.\n", tmp);
+                               g_critical("Invalid probe %d.", tmp);
                                error = TRUE;
                                break;
                        }
@@ -127,9 +125,9 @@ GHashTable *parse_generic_arg(const char *arg)
 struct sr_dev *parse_devstring(const char *devstring)
 {
        struct sr_dev *dev, *d;
-       struct sr_dev_plugin *plugin;
-       GSList *devs, *plugins, *l, *p;
-       int num_devs, dev_num, dev_cnt;
+       struct sr_dev_driver **drivers;
+       GSList *devs, *l;
+       int i, num_devs, dev_num, dev_cnt;
        char *tmp;
 
        if (!devstring)
@@ -138,8 +136,8 @@ struct sr_dev *parse_devstring(const char *devstring)
        dev = NULL;
        dev_num = strtol(devstring, &tmp, 10);
        if (tmp != devstring) {
-               /* argument is numeric, meaning a device ID. Make all driver
-                * plugins scan for devices.
+               /* argument is numeric, meaning a device ID. Make all drivers
+                * scan for devices.
                 */
                num_devs = num_real_devs();
                if (dev_num < 0 || dev_num >= num_devs)
@@ -164,12 +162,11 @@ struct sr_dev *parse_devstring(const char *devstring)
                 * no need to let them all scan
                 */
                dev = NULL;
-               plugins = sr_hw_list();
-               for (p = plugins; p; p = p->next) {
-                       plugin = p->data;
-                       if (strcmp(plugin->name, devstring))
+               drivers = sr_driver_list();
+               for (i = 0; drivers[i]; i++) {
+                       if (strcmp(drivers[i]->name, devstring))
                                continue;
-                       num_devs = sr_hw_init(plugin);
+                       num_devs = sr_driver_init(drivers[i]);
                        if (num_devs == 1) {
                                devs = sr_dev_list();
                                dev = devs->data;
@@ -184,3 +181,34 @@ struct sr_dev *parse_devstring(const char *devstring)
 
        return dev;
 }
+
+char *strcanon(const char *str)
+{
+       int p0, p1;
+       char *s;
+
+       /* Returns newly allocated string. */
+       s = g_ascii_strdown(str, -1);
+       for (p0 = p1 = 0; str[p0]; p0++) {
+               if ((s[p0] >= 'a' && s[p0] <= 'z')
+                               || (s[p0] >= '0' && s[p0] <= '9'))
+                       s[p1++] = s[p0];
+       }
+       s[p1] = '\0';
+
+       return s;
+}
+
+int canon_cmp(const char *str1, const char *str2)
+{
+       int ret;
+       char *s1, *s2;
+
+       s1 = strcanon(str1);
+       s2 = strcanon(str2);
+       ret = g_ascii_strcasecmp(s1, s2);
+       g_free(s2);
+       g_free(s1);
+
+       return ret;
+}