diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-27 23:18:19 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-27 23:18:19 +0000 |
| commit | 3ead3a994a6076638c1ced87fbf02834c00ba0a8 (patch) | |
| tree | d383ab0e34b7d201c66e58e4c7380a89b1a6104b /epan/column-utils.c | |
| parent | 233c40918468ace3d76cd67a7e7ff585e5916d20 (diff) | |
Remove "Cisco MDS-specific" fields from packet_info. 2 of the 3 fields were used strictly for columns that are considered "deprecated" and I think the third could be put in that category as well.
I assume the column enumerations haven't already been removed because of legacy "indexing issues", but if I'm wrong, we should definitely remove the columns altogether. Could also see renaming columns to DEPRECATED_[X].
svn path=/trunk/; revision=52910
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 9ece8e7f1d..85fb3c530f 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1813,11 +1813,6 @@ col_fill_in(packet_info *pinfo, const gboolean fill_col_exprs, const gboolean fi col_set_port(pinfo, i, FALSE, FALSE, fill_col_exprs); break; - case COL_VSAN: - guint32_to_str_buf(pinfo->vsan, pinfo->cinfo->col_buf[i], COL_MAX_LEN); - pinfo->cinfo->col_data[i] = pinfo->cinfo->col_buf[i]; - break; - case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */ g_assert_not_reached(); break; @@ -2025,13 +2020,13 @@ col_fill_fdata(packet_info *pinfo) set_circuit_id(pinfo); break; case COL_SRCIDX: - fdata->col_text[i] = (gchar *)(GUINT_TO_POINTER((guint)pinfo->src_idx)); + fdata->col_text[i] = (gchar *)-1; /* !! DEPRECATED !!*/ break; case COL_DSTIDX: - fdata->col_text[i] = (gchar *)(GUINT_TO_POINTER((guint)pinfo->dst_idx)); + fdata->col_text[i] = (gchar *)-1; /* !! DEPRECATED !!*/ break; case COL_VSAN: - fdata->col_text[i] = (gchar *)(GUINT_TO_POINTER((guint)pinfo->vsan)); + fdata->col_text[i] = (gchar *)-1; /* !! DEPRECATED !!*/ break; case NUM_COL_FMTS: /* keep compiler happy - shouldn't get here */ |