Remove the "bug compatibility" support. It's assumed that the omission
of the colon after the protocol decoder ID in log level 3 was less of a
design choice, but instead a byproduct of the redundancy in a previous
implementation (multiple code paths that got out of sync).
int i;
char **ann_descr;
gboolean show_ann, show_snum, show_class, show_quotes, show_abbrev;
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;
const char *quote;
(void)cb_data;
show_class = TRUE;
show_abbrev = TRUE;
}
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
/*
* Display the annotation's fields after the layout was
printf("%" PRIu64 "-%" PRIu64 " ",
pdata->start_sample, pdata->end_sample);
}
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]);
if (show_class) {
ann_descr = g_slist_nth_data(dec->annotations, pda->ann_class);
printf("%s: ", ann_descr[0]);