diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2008-02-13 05:05:33 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2008-02-13 05:05:33 +0000 |
| commit | 8f3a1b0d16653c2e6a209680164b39910973e08d (patch) | |
| tree | 39e564efcec404832a0276bcb5f4688f0a34333f /epan/column.c | |
| parent | 7a6d8d7955a1fc471790b949eb027b770fb43cdb (diff) | |
Check in changes originally checked in as SVN revision 24308 (new column
type: Custom) that were backed out in SVN revision 24309.
Changes since that revision include a reworking of the handling of the
cfile/cinfo variables in epan/column-utils.c, addition of three new
functions to libwireshark.def and a bug fix to prevent a crash when no
custom columns were not in use.
Compilation verified locally on MacOS X, Linux and Windows.
svn path=/trunk/; revision=24317
Diffstat (limited to 'epan/column.c')
| -rw-r--r-- | epan/column.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/epan/column.c b/epan/column.c index 7afaded3e3..45cf19e78f 100644 --- a/epan/column.c +++ b/epan/column.c @@ -105,7 +105,8 @@ col_format_to_string(gint fmt) { "%C", "%l", "%a", - "%F" + "%F", + "%Cus" }; if (fmt < 0 || fmt >= NUM_COL_FMTS) @@ -174,7 +175,8 @@ static const gchar *dlist[NUM_COL_FMTS] = { "Frame Relay DLCI", /* COL_FR_DLCI */ "GPRS BSSGP TLLI", /* COL_BSSGP_TLLI */ "Expert Info Severity", /* COL_EXPERT */ - "Frequency/Channel" /* COL_FREQ_CHAN */ + "Frequency/Channel", /* COL_FREQ_CHAN */ + "Custom" /* COL_CUSTOM */ }; const gchar * @@ -299,6 +301,9 @@ get_column_format_matches(gboolean *fmt_list, gint format) { case COL_FREQ_CHAN: fmt_list[COL_FREQ_CHAN] = TRUE; break; + case COL_CUSTOM: + fmt_list[COL_CUSTOM] = TRUE; + break; default: break; } |