aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-12-09 06:48:40 +0000
committerGuy Harris <guy@alum.mit.edu>2003-12-09 06:48:40 +0000
commit11d8817da0148daa1cda2db873a3ec31c0c02a69 (patch)
tree3958ce9f0093b2fb5c831ed58c5adb1a660df655 /epan
parentc7cee4331f5586c7987a82caaf93351f07ec288e (diff)
Don't automatically size the columns - that's expensive in large
captures, as it has to compute the width of an auto-resizing column in every row. Just pick fixed widths for the columns (and tune the width of the "Protocol" column so that it's not narrower than the column title). svn path=/trunk/; revision=9219
Diffstat (limited to 'epan')
-rw-r--r--epan/column-utils.c3
-rw-r--r--epan/column_info.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 59e8f2e120..cebe7eb42d 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1,7 +1,7 @@
/* column-utils.c
* Routines for column utilities.
*
- * $Id: column-utils.c,v 1.40 2003/12/02 23:14:31 guy Exp $
+ * $Id: column-utils.c,v 1.41 2003/12/09 06:48:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -57,7 +57,6 @@ col_setup(column_info *col_info, gint num_cols)
col_info->fmt_matx = (gboolean **) g_malloc(sizeof(gboolean *) * num_cols);
col_info->col_first = (int *) g_malloc(sizeof(int) * (NUM_COL_FMTS));
col_info->col_last = (int *) g_malloc(sizeof(int) * (NUM_COL_FMTS));
- col_info->col_width = (gint *) g_malloc(sizeof(gint) * num_cols);
col_info->col_title = (gchar **) g_malloc(sizeof(gchar *) * num_cols);
col_info->col_data = (gchar **) g_malloc(sizeof(gchar *) * num_cols);
col_info->col_buf = (gchar **) g_malloc(sizeof(gchar *) * num_cols);
diff --git a/epan/column_info.h b/epan/column_info.h
index 48332f8194..790211c556 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -1,7 +1,7 @@
/* column.h
* Definitions for column structures and routines
*
- * $Id: column_info.h,v 1.10 2003/12/02 23:14:31 guy Exp $
+ * $Id: column_info.h,v 1.11 2003/12/09 06:48:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,6 @@ typedef struct _column_info {
gboolean **fmt_matx; /* Specifies which formats apply to a column */
gint *col_first; /* First column number with a given format */
gint *col_last; /* Last column number with a given format */
- gint *col_width; /* Column widths to use during a "-S" capture */
gchar **col_title; /* Column titles */
gchar **col_data; /* Column data */
gchar **col_buf; /* Buffer into which to copy data for column */