parsers: warn about unknown input/output module option keys

[sigrok-cli.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index ee992712bd126fb261fea9991e9e529dba260fb0..5652b78dc096eaf3ef95d43e63e61a6f656eb891 100644 (file)
--- 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;
@@ -296,6 +297,57 @@ GHashTable *parse_generic_arg(const char *arg, gboolean sep_first)
        return hash;
 }
 
+GSList *check_unknown_keys(const struct sr_option **avail, GHashTable *used)
+{
+       GSList *unknown;
+       GHashTableIter iter;
+       void *key;
+       const char *used_id;
+       size_t avail_idx;
+       const char *avail_id, *found_id;
+
+       /* Collect a list of used but not available keywords. */
+       unknown = NULL;
+       g_hash_table_iter_init(&iter, used);
+       while (g_hash_table_iter_next(&iter, &key, NULL)) {
+               used_id = key;
+               found_id = NULL;
+               for (avail_idx = 0; avail[avail_idx] && avail[avail_idx]->id; avail_idx++) {
+                       avail_id = avail[avail_idx]->id;
+                       if (strcmp(avail_id, used_id) == 0) {
+                               found_id = avail_id;
+                               break;
+                       }
+               }
+               if (!found_id)
+                       unknown = g_slist_append(unknown, g_strdup(used_id));
+       }
+
+       /* Return the list of unknown keywords, or NULL if empty. */
+       return unknown;
+}
+
+gboolean warn_unknown_keys(const struct sr_option **avail, GHashTable *used,
+       const char *caption)
+{
+       GSList *unknown, *l;
+       gboolean had_unknown;
+       const char *s;
+
+       if (!caption || !*caption)
+               caption = "Unknown keyword";
+
+       unknown = check_unknown_keys(avail, used);
+       had_unknown = unknown != NULL;
+       for (l = unknown; l; l = l->next) {
+               s = l->data;
+               g_warning("%s: %s.", caption, s);
+       }
+       g_slist_free_full(unknown, g_free);
+
+       return had_unknown;
+}
+
 GHashTable *generic_arg_to_opt(const struct sr_option **opts, GHashTable *genargs)
 {
        GHashTable *hash;
@@ -408,12 +460,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 +502,3 @@ int parse_driver(char *arg, struct sr_dev_driver **driver, GSList **drvopts)
 
        return TRUE;
 }
-