summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-08 17:29:57 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-08 17:29:57 +0000
commitb90a11bee38ef689b9b8a77118f2b0b0f4754e95 (patch)
treee0a38fd42b0a805e4c31588e4fb4e630dec0fb84 /tshark.c
parent4c1be318241d0b86585b2e55c124d562d45e2475 (diff)
downloadwireshark-b90a11bee38ef689b9b8a77118f2b0b0f4754e95.tar.gz
Make tshark and rawshark use build_column_format_array() instead of duplicating the code
svn path=/trunk/; revision=29803
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c44
1 files changed, 2 insertions, 42 deletions
diff --git a/tshark.c b/tshark.c
index 05eb227431..01b46b9de7 100644
--- a/tshark.c
+++ b/tshark.c
@@ -739,7 +739,7 @@ int
main(int argc, char *argv[])
{
char *init_progfile_dir_error;
- int opt, i;
+ int opt;
extern char *optarg;
gboolean arg_error = FALSE;
@@ -1449,47 +1449,7 @@ main(int argc, char *argv[])
}
/* Build the column format array */
- col_setup(&cfile.cinfo, prefs->num_cols);
- for (i = 0; i < cfile.cinfo.num_cols; i++) {
- cfile.cinfo.col_fmt[i] = get_column_format(i);
- cfile.cinfo.col_title[i] = g_strdup(get_column_title(i));
- if (cfile.cinfo.col_fmt[i] == COL_CUSTOM) {
- cfile.cinfo.col_custom_field[i] = g_strdup(get_column_custom_field(i));
- if(!dfilter_compile(cfile.cinfo.col_custom_field[i], &cfile.cinfo.col_custom_dfilter[i])) {
- /* XXX: Should we issue a warning? */
- g_free(cfile.cinfo.col_custom_field[i]);
- cfile.cinfo.col_custom_field[i] = NULL;
- cfile.cinfo.col_custom_dfilter[i] = NULL;
- }
- } else {
- cfile.cinfo.col_custom_field[i] = NULL;
- cfile.cinfo.col_custom_dfilter[i] = NULL;
- }
- cfile.cinfo.fmt_matx[i] = (gboolean *) g_malloc0(sizeof(gboolean) *
- NUM_COL_FMTS);
- get_column_format_matches(cfile.cinfo.fmt_matx[i], cfile.cinfo.col_fmt[i]);
- cfile.cinfo.col_data[i] = NULL;
- if (cfile.cinfo.col_fmt[i] == COL_INFO)
- cfile.cinfo.col_buf[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_INFO_LEN);
- else
- cfile.cinfo.col_buf[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
- cfile.cinfo.col_fence[i] = 0;
- cfile.cinfo.col_expr.col_expr[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
- cfile.cinfo.col_expr.col_expr_val[i] = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
- }
-
- for (i = 0; i < cfile.cinfo.num_cols; i++) {
- int j;
-
- for (j = 0; j < NUM_COL_FMTS; j++) {
- if (!cfile.cinfo.fmt_matx[i][j])
- continue;
-
- if (cfile.cinfo.col_first[j] == -1)
- cfile.cinfo.col_first[j] = i;
- cfile.cinfo.col_last[j] = i;
- }
- }
+ build_column_format_array(&cfile.cinfo, prefs->num_cols, TRUE);
#ifdef HAVE_LIBPCAP
capture_opts_trim_snaplen(&global_capture_opts, MIN_PACKET_SIZE);