- printf("%s: ", pdata->pdo->proto_id);
- /* Show only the longest annotation. */
- printf("\"%s\" ", pda->ann_text[0]);
+ if (opt_loglevel == SR_LOG_INFO) {
+ printf("\"%s\" ", pda->ann_text[0]);
+ } else {
+ /* Protocol decoder id, annotation class,
+ * all annotation strings. */
+ ann_descr = g_slist_nth_data(dec->annotations, pda->ann_format);
+ printf("%s: %s: ", pdata->pdo->proto_id, ann_descr[0]);
+ for (i = 0; pda->ann_text[i]; i++)
+ printf("\"%s\" ", pda->ann_text[i]);
+ }
+ }