#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <assert.h>
#include "sigrok-cli.h"
#ifdef HAVE_SRD
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]);
return 0;
}
-static inline void pd_ann_check(gboolean chk)
-{
-
- assert(chk);
-}
-
void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
{
struct srd_decoder *dec;
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;
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.
* 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) {
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
* determined above.
*/
- pd_ann_check(show_ann);
- if (opt_loglevel <= SR_LOG_WARN) {
- pd_ann_check(!show_snum);
- pd_ann_check(show_id_colon);
- pd_ann_check(!show_class);
- pd_ann_check(!show_quotes);
- pd_ann_check(!show_abbrev);
- /* Show only the longest annotation. */
- printf("%s: %s", pdata->pdo->proto_id, pda->ann_text[0]);
- } else if (opt_loglevel >= SR_LOG_INFO) {
- /* Sample numbers and quotes around the longest annotation. */
- pd_ann_check(show_snum);
- printf("%"PRIu64"-%"PRIu64"", pdata->start_sample, pdata->end_sample);
- if (opt_loglevel == SR_LOG_INFO) {
- pd_ann_check(!show_id_colon);
- pd_ann_check(!show_class);
- pd_ann_check(show_quotes);
- pd_ann_check(!show_abbrev);
- printf(" %s \"%s\"", pdata->pdo->proto_id, pda->ann_text[0]);
- } else {
- pd_ann_check(show_id_colon);
- pd_ann_check(show_class);
- pd_ann_check(show_quotes);
- pd_ann_check(show_abbrev);
- /* Protocol decoder id, annotation class,
- * all annotation strings. */
- ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
- printf(" %s: %s:", pdata->pdo->proto_id, ann_descr[0]);
- for (i = 0; pda->ann_text[i]; i++)
- printf(" \"%s\"", pda->ann_text[i]);
- }
+ if (show_snum) {
+ printf("%" PRIu64 "-%" PRIu64 " ",
+ pdata->start_sample, pdata->end_sample);
+ }
+ 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]);
+ }
+ quote = show_quotes ? "\"" : "";
+ printf("%s%s%s", quote, pda->ann_text[0], quote);
+ if (show_abbrev) {
+ for (i = 1; pda->ann_text[i]; i++)
+ printf(" %s%s%s", quote, pda->ann_text[i], quote);
}
printf("\n");
fflush(stdout);
/* 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));
projects / sigrok-cli.git / blobdiff