diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-03 21:56:16 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-04 16:32:03 +0000 |
| commit | 553da374461efb87436dbbed7d319d252d4fe2e6 (patch) | |
| tree | 1f581449dc0a022f8feb4f2088aec6fb47fd023f /epan/ftypes/ftype-pcre.c | |
| parent | 2085bbec9d0e4661af77a6e9530cffd5df15ecc8 (diff) | |
| download | wireshark-553da374461efb87436dbbed7d319d252d4fe2e6.tar.gz | |
Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type.
These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter.
Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type.
Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values.
Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9
Reviewed-on: https://code.wireshark.org/review/6098
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/ftypes/ftype-pcre.c')
| -rw-r--r-- | epan/ftypes/ftype-pcre.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c index 947aff3047..f324370527 100644 --- a/epan/ftypes/ftype-pcre.c +++ b/epan/ftypes/ftype-pcre.c @@ -116,14 +116,14 @@ val_from_unparsed(fvalue_t *fv, const char *pattern, gboolean allow_partial_valu } static int -gregex_repr_len(fvalue_t *fv, ftrepr_t rtype) +gregex_repr_len(fvalue_t *fv, ftrepr_t rtype, int field_display _U_) { g_assert(rtype == FTREPR_DFILTER); return (int)strlen(g_regex_get_pattern(fv->value.re)); } static void -gregex_to_repr(fvalue_t *fv, ftrepr_t rtype, char *buf) +gregex_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char *buf) { g_assert(rtype == FTREPR_DFILTER); strcpy(buf, g_regex_get_pattern(fv->value.re)); |