diff options
author | Stephen Fisher <steve@stephen-fisher.com> | 2008-03-01 05:16:45 +0000 |
---|---|---|
committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-03-01 05:16:45 +0000 |
commit | 56226b49b8818f12ccaef777f427834958dc5dba (patch) | |
tree | 7b42047b1a68cbcc4e11173f6726c47b25c6ae3e /epan/column_info.h | |
parent | 61caa0b5b9bd530493e6a66fb9b6e38c1b29404a (diff) |
Custom column updates:
- Change apply / prepare / ... as filter to use the field's value, which
is now stored in fdata as well as cinfo. Now we don't have to reprocess
the entire packet list when using these features. This also prevents
the use of these features from overwriting custom column information.
(custom columns can now be used in apply / prepare ... as filter)
- Break col_expr and col_expr_val out into a struct that is included not only
in cinfo, but now also fdata.
- Have col_custom_set_fstr() quote FT_STRING & FT_STRINGZ when storing the
col_expr_val value (for filter creation).
svn path=/trunk/; revision=24511
Diffstat (limited to 'epan/column_info.h')
-rw-r--r-- | epan/column_info.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/column_info.h b/epan/column_info.h index 3d7d095212..f175fba6f5 100644 --- a/epan/column_info.h +++ b/epan/column_info.h @@ -34,6 +34,11 @@ extern "C" { #define COL_MAX_LEN 256 #define COL_MAX_INFO_LEN 4096 +typedef struct { + gchar **col_expr; /* Filter expression */ + gchar **col_expr_val; /* Value for filter expression */ +} col_expr_t; + typedef struct _column_info { gint num_cols; /* Number of columns */ gint *col_fmt; /* Format of column */ @@ -45,8 +50,7 @@ typedef struct _column_info { const gchar **col_data; /* Column data */ gchar **col_buf; /* Buffer into which to copy data for column */ int *col_fence; /* Stuff in column buffer before this index is immutable */ - gchar **col_expr; /* Filter expression */ - gchar **col_expr_val; /* Value for filter expression */ + col_expr_t col_expr; /* Column expressions and values */ gboolean writable; /* Are we still writing to the columns? */ gboolean columns_changed; /* Have the columns been changed in the prefs? */ } column_info; |