GSList *optl;
GVariant *gvar;
gint64 val_int;
+ double val_dbl;
int ret;
char *val_str, *conv;
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));
keyval = g_strsplit(*pdtok, "=", 0);
if (!(dec = srd_decoder_get_by_id(keyval[0]))) {
g_critical("Protocol decoder '%s' not found.", keyval[0]);
+ g_strfreev(keyval);
+ g_strfreev(pds);
return 1;
}
if (!dec->annotations) {
g_critical("Protocol decoder '%s' has no annotations.", keyval[0]);
+ g_strfreev(keyval);
+ g_strfreev(pds);
return 1;
}
if (g_strv_length(keyval) == 2 && keyval[1][0] != '\0') {
if (!l) {
g_critical("Annotation '%s' not found "
"for protocol decoder '%s'.", *ann, keyval[0]);
+ g_strfreev(keyval);
+ g_strfreev(pds);
return 1;
}
l_ann = g_hash_table_lookup(pd_ann_visible, keyval[0]);
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;
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
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]);