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/tap-sequence-analysis.c | |
| parent | b9145bc836daafd6cad960b95e9d2144781e7317 (diff) | |
| download | wireshark-da09a1bfd86c2066ab492178bd2c0faa96bfd579.tar.gz | |
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/tap-sequence-analysis.c')
| -rw-r--r-- | ui/tap-sequence-analysis.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index eb35b9125c..72c3f7bad8 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -75,6 +75,7 @@ static gboolean seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *dummy _U_) { seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr; + col_item_t* col_item; if ((sainfo->all_packets)||(pinfo->fd->flags.passed_dfilter==1)){ int i; @@ -108,8 +109,9 @@ seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U if (pinfo->cinfo->col_first[COL_INFO]>=0){ for (i = pinfo->cinfo->col_first[COL_INFO]; i <= pinfo->cinfo->col_last[COL_INFO]; i++) { - if (pinfo->cinfo->fmt_matx[i][COL_INFO]) { - colinfo = g_strdup(pinfo->cinfo->col_data[i]); + col_item = &pinfo->cinfo->columns[i]; + if (col_item->fmt_matx[COL_INFO]) { + colinfo = g_strdup(col_item->col_data); /* break; ? or g_free(colinfo); before g_strdup() */ } } @@ -118,8 +120,9 @@ seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U if (pinfo->cinfo->col_first[COL_PROTOCOL]>=0){ for (i = pinfo->cinfo->col_first[COL_PROTOCOL]; i <= pinfo->cinfo->col_last[COL_PROTOCOL]; i++) { - if (pinfo->cinfo->fmt_matx[i][COL_PROTOCOL]) { - protocol = g_strdup(pinfo->cinfo->col_data[i]); + col_item = &pinfo->cinfo->columns[i]; + if (col_item->fmt_matx[COL_PROTOCOL]) { + protocol = g_strdup(col_item->col_data); /* break; ? or g_free(protocol); before g_strdup() */ } } |