aboutsummaryrefslogtreecommitdiffstats
path: root/epan/print.c
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2015-09-12 17:40:55 +0200
committerGuy Harris <guy@alum.mit.edu>2015-09-12 20:19:59 +0000
commit68dd2c823aff0c79263c9bf8feabe031b747c0cc (patch)
tree4fd82ddc89ac55a8e46fbc17aea1a6a78549a933 /epan/print.c
parent722174359edf4e756904d8752c1f65247fd2d20d (diff)
Display the name of the invalid field when tshark is run with -T fields
-e invalidfield Change-Id: Iaf8733096d9e1d15510a38363397b1dcd972ff59 Reviewed-on: https://code.wireshark.org/review/10504 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/print.c')
-rw-r--r--epan/print.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/print.c b/epan/print.c
index 4ab69c8a36..f97c5c3be0 100644
--- a/epan/print.c
+++ b/epan/print.c
@@ -1075,30 +1075,28 @@ static void
output_field_check(void *data, void *user_data)
{
gchar *field = (gchar *)data;
- gboolean *all_valid = (gboolean *)user_data;
+ GSList **invalid_fields = (GSList **)user_data;
if (!strncmp(field, COLUMN_FIELD_FILTER, strlen(COLUMN_FIELD_FILTER)))
return;
if (!proto_registrar_get_byname(field)) {
- g_warning("'%s' isn't a valid field!", field);
- *all_valid = FALSE;
+ *invalid_fields = g_slist_prepend(*invalid_fields, field);
}
}
-gboolean
+GSList *
output_fields_valid(output_fields_t *fields)
{
- gboolean all_valid = TRUE;
-
+ GSList *invalid_fields = NULL;
if (fields->fields == NULL) {
- return TRUE;
+ return NULL;
}
- g_ptr_array_foreach(fields->fields, output_field_check, &all_valid);
+ g_ptr_array_foreach(fields->fields, output_field_check, &invalid_fields);
- return all_valid;
+ return invalid_fields;
}
gboolean output_fields_set_option(output_fields_t *info, gchar *option)