decode: stricter check for integer decoder options

[sigrok-cli.git] / decode.c

diff --git a/decode.c b/decode.c
index 24c700183f02e7793f5dfc8cdfc839dac28c1ada..1ba5ef20ec80781de8ba3f3c0fa46a730ea6a7e3 100644 (file)
--- a/decode.c
+++ b/decode.c
@@ -38,6 +38,7 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
        GSList *optl;
        GVariant *gvar;
        gint64 val_int;
+       double val_dbl;
        int ret;
        char *val_str, *conv;
 
@@ -53,14 +54,25 @@ static int opts_to_gvar(struct srd_decoder *dec, GHashTable *hash,
                if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_STRING)) {
                        gvar = g_variant_new_string(val_str);
                } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_INT64)) {
+                       conv = NULL;
                        val_int = strtoll(val_str, &conv, 0);
-                       if (!conv || conv == val_str) {
+                       if (!conv || conv == val_str || *conv) {
                                g_critical("Protocol decoder '%s' option '%s' "
                                                "requires a number.", dec->name, o->id);
                                ret = FALSE;
                                break;
                        }
                        gvar = g_variant_new_int64(val_int);
+               } else if (g_variant_is_of_type(o->def, G_VARIANT_TYPE_DOUBLE)) {
+                       conv = NULL;
+                       val_dbl = strtod(val_str, &conv);
+                       if (!conv || conv == val_str || *conv) {
+                               g_critical("Protocol decoder '%s' option '%s' requires a float number.",
+                                       dec->name, o->id);
+                               ret = FALSE;
+                               break;
+                       }
+                       gvar = g_variant_new_double(val_dbl);
                } else {
                        g_critical("Unsupported type for option '%s' (%s)",
                                        o->id, g_variant_get_type_string(o->def));
@@ -424,7 +436,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
        int i;
        char **ann_descr;
        gboolean show_ann, show_snum, show_class, show_quotes, show_abbrev;
-       gboolean show_id_colon;
        const char *quote;
 
        (void)cb_data;
@@ -452,8 +463,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
                return;
 
        /*
-        * Determine the annotation's layout from the verbosity of the
-        * log level:
+        * Determine which fields of the annotation to display. Inspect
+        * user specified options as well as the verbosity of the log level:
         * - Optionally show the sample numbers for the annotation's span.
         * - Always show the protocol decoder ID.
         * - Optionally show the annotation's class description.
@@ -464,7 +475,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
         *   recipients might have to deal with a set of text variants.
         */
        show_snum = show_class = show_quotes = show_abbrev = FALSE;
-       if (opt_loglevel > SR_LOG_WARN) {
+       if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN) {
                show_snum = TRUE;
        }
        if (opt_loglevel > SR_LOG_WARN) {
@@ -474,8 +485,6 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
                show_class = TRUE;
                show_abbrev = TRUE;
        }
-       /* Backwards (bug?) compatibility. */
-       show_id_colon = show_abbrev || !show_quotes;
 
        /*
         * Display the annotation's fields after the layout was
@@ -485,7 +494,7 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
                printf("%" PRIu64 "-%" PRIu64 " ",
                        pdata->start_sample, pdata->end_sample);
        }
-       printf("%s%s ", pdata->pdo->proto_id, show_id_colon ? ":" : "");
+       printf("%s: ", pdata->pdo->proto_id);
        if (show_class) {
                ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
                printf("%s: ", ann_descr[0]);
@@ -509,7 +518,7 @@ void show_pd_meta(struct srd_proto_data *pdata, void *cb_data)
                /* Not in the list of PDs whose meta output we're showing. */
                return;
 
-       if (opt_loglevel > SR_LOG_WARN)
+       if (opt_pd_samplenum || opt_loglevel > SR_LOG_WARN)
                printf("%"PRIu64"-%"PRIu64" ", pdata->start_sample, pdata->end_sample);
        printf("%s: ", pdata->pdo->proto_id);
        printf("%s: %s", pdata->pdo->meta_name, g_variant_print(pdata->data, FALSE));