diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-06-26 23:00:33 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-06-29 02:11:04 +0000 |
| commit | da09a1bfd86c2066ab492178bd2c0faa96bfd579 (patch) | |
| tree | d0855286253963750b272e04ec2e57b56c9bfee1 /ui/packet_list_utils.c | |
| parent | b9145bc836daafd6cad960b95e9d2144781e7317 (diff) | |
Take all epan_column_info members that always get allocated to "number of columns" to share their own data structure.
Change-Id: Ib982662db6cf68730a7d121eac60d9bc5ae67429
Reviewed-on: https://code.wireshark.org/review/9195
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/packet_list_utils.c')
| -rw-r--r-- | ui/packet_list_utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/packet_list_utils.c b/ui/packet_list_utils.c index 0f8ab2b775..348fa9ccc5 100644 --- a/ui/packet_list_utils.c +++ b/ui/packet_list_utils.c @@ -37,7 +37,7 @@ right_justify_column (gint col, capture_file *cf) if (!cf) return FALSE; - switch (cf->cinfo.col_fmt[col]) { + switch (cf->cinfo.columns[col].col_fmt) { case COL_NUMBER: case COL_PACKET_LENGTH: @@ -54,7 +54,7 @@ right_justify_column (gint col, capture_file *cf) break; case COL_CUSTOM: - hfi = proto_registrar_get_byname(cf->cinfo.col_custom_field[col]); + hfi = proto_registrar_get_byname(cf->cinfo.columns[col].col_custom_field); /* Check if this is a valid field and we have no strings lookup table */ if ((hfi != NULL) && ((hfi->strings == NULL) || !get_column_resolved(col))) { /* Check for bool, framenum and decimal/octal integer types */ @@ -81,10 +81,10 @@ resolve_column (gint col, capture_file *cf) if (!cf) return FALSE; - switch (cf->cinfo.col_fmt[col]) { + switch (cf->cinfo.columns[col].col_fmt) { case COL_CUSTOM: - hfi = proto_registrar_get_byname(cf->cinfo.col_custom_field[col]); + hfi = proto_registrar_get_byname(cf->cinfo.columns[col].col_custom_field); /* Check if this is a valid field */ if (hfi != NULL) { /* Check if we have an OID or a strings table with integer values */ |