X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;fp=session.c;h=1d98877801a429e3f0b437f976f7958f68871056;hp=6e101784606dc4d168a824be891f48413ceffb33;hb=84b39e3e488c4897df5afb5ffeca21ef30c71fba;hpb=e950559979908f828a903ede8a50bde091566eed diff --git a/session.c b/session.c index 6e10178..1d98877 100644 --- a/session.c +++ b/session.c @@ -358,7 +358,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) double tmp_double, dlow, dhigh; uint64_t tmp_u64, p, q, low, high, mqflags; uint32_t mq; - GVariant *rational[2], *range[2], *gvar, *gtup[2]; + GVariant *rational[2], *range[2], *gtup[2]; GVariantBuilder *vbl; gboolean tmp_bool; gchar **keyval; @@ -453,7 +453,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) g_strfreev(keyval); } break; - case SR_T_MQLIST: + case SR_T_MQ: /* Argument is MQ id e.g. ("voltage") optionally followed by one or more / e.g. "/ac". @@ -475,12 +475,9 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src) } g_strfreev(keyval); if (ret != -1) { - vbl = g_variant_builder_new(G_VARIANT_TYPE_ARRAY); gtup[0] = g_variant_new_uint32(mq); gtup[1] = g_variant_new_uint64(mqflags); - gvar = g_variant_new_tuple(gtup, 2); - g_variant_builder_add_value(vbl, gvar); - src->data = g_variant_builder_end(vbl); + src->data = g_variant_new_tuple(gtup, 2); } break; default: