Small variable naming fix to avoid confusion.

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index d21ae1c8da159ed293715720c1bae2425be91e4c..a194a5cb9c3ec9c4a7a8c854b5c52331ef4dc8ac 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -317,8 +317,8 @@ static void show_dev_detail(void)
        GSList *devices;
        GVariant *gvar_opts, *gvar_dict, *gvar_list, *gvar;
        gsize num_opts, num_elements;
-       const uint64_t *int64;
-       const int32_t *opts, *int32;
+       const uint64_t *uint64, p, q;
+       const int32_t *opts;
        unsigned int num_devices, tmp_bool, o, i;
        char *s;
        const char *charopts, **stropts;
@@ -409,27 +409,27 @@ static void show_dev_detail(void)
                        }
                        if ((gvar_list = g_variant_lookup_value(gvar_dict,
                                        "samplerates", G_VARIANT_TYPE("at")))) {
-                               int64 = g_variant_get_fixed_array(gvar_list,
+                               uint64 = g_variant_get_fixed_array(gvar_list,
                                                &num_elements, sizeof(uint64_t));
                                printf(" - supported samplerates:\n");
                                for (i = 0; i < num_elements; i++)
-                                       printf("      %s\n", sr_samplerate_string(int64[i]));
+                                       printf("      %s\n", sr_samplerate_string(uint64[i]));
                        } if ((gvar_list = g_variant_lookup_value(gvar_dict,
                                        "samplerate-steps", G_VARIANT_TYPE("at")))) {
-                               int64 = g_variant_get_fixed_array(gvar_list,
+                               uint64 = g_variant_get_fixed_array(gvar_list,
                                                &num_elements, sizeof(uint64_t));
                                /* low */
-                               if (!(s = sr_samplerate_string(int64[0])))
+                               if (!(s = sr_samplerate_string(uint64[0])))
                                        continue;
                                printf(" (%s", s);
                                g_free(s);
                                /* high */
-                               if (!(s = sr_samplerate_string(int64[1])))
+                               if (!(s = sr_samplerate_string(uint64[1])))
                                        continue;
                                printf(" - %s", s);
                                g_free(s);
                                /* step */
-                               if (!(s = sr_samplerate_string(int64[2])))
+                               if (!(s = sr_samplerate_string(uint64[2])))
                                        continue;
                                printf(" in steps of %s)\n", s);
                                g_free(s);
@@ -445,11 +445,11 @@ static void show_dev_detail(void)
                                printf("\n");
                                continue;
                        }
-                       int64 = g_variant_get_fixed_array(gvar_list,
+                       uint64 = g_variant_get_fixed_array(gvar_list,
                                        &num_elements, sizeof(uint64_t));
                        printf(" - supported buffer sizes:\n");
                        for (i = 0; i < num_elements; i++)
-                               printf("      %"PRIu64"\n", int64[i]);
+                               printf("      %"PRIu64"\n", uint64[i]);
                        g_variant_unref(gvar_list);
 
                } else if (srci->key == SR_CONF_TIMEBASE) {
@@ -461,11 +461,14 @@ static void show_dev_detail(void)
                                continue;
                        }
                        printf(" - supported time bases:\n");
-                       int64 = g_variant_get_fixed_array(gvar_list,
-                                       &num_elements, sizeof(uint64_t));
-                       for (i = 0; i < num_elements / 2; i++)
-                               printf("      %s\n", sr_period_string(
-                                               int64[i * 2] * int64[i * 2 + 1]));
+                       num_elements = g_variant_n_children(gvar_list);
+                       for (i = 0; i < num_elements; i++) {
+                               gvar = g_variant_get_child_value(gvar_list, i);
+                               g_variant_get(gvar, "(tt)", &p, &q);
+                               s = sr_period_string(p * q);
+                               printf("      %s\n", s);
+                               g_free(s);
+                       }
                        g_variant_unref(gvar_list);
 
                } else if (srci->key == SR_CONF_TRIGGER_SOURCE) {
@@ -505,11 +508,14 @@ static void show_dev_detail(void)
                                continue;
                        }
                        printf(" - supported volts/div:\n");
-                       int64 = g_variant_get_fixed_array(gvar_list,
-                                       &num_elements, sizeof(uint64_t));
-                       for (i = 0; i < num_elements / 2; i++)
-                               printf("      %s\n", sr_voltage_string(
-                                               int64[i * 2], int64[i * 2 + 1]));
+                       num_elements = g_variant_n_children(gvar_list);
+                       for (i = 0; i < num_elements; i++) {
+                               gvar = g_variant_get_child_value(gvar_list, i);
+                               g_variant_get(gvar, "(tt)", &p, &q);
+                               s = sr_voltage_string(p, q);
+                               printf("      %s\n", s);
+                               g_free(s);
+                       }
                        g_variant_unref(gvar_list);
 
                } else if (srci->key == SR_CONF_COUPLING) {