aboutsummaryrefslogtreecommitdiffstats
path: root/epan/ftypes
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-06-20 07:51:54 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2015-06-20 13:59:40 +0000
commit5714ad5e8be1722ecfcb8013a56de53eea00bfed (patch)
treef0be7ea1eb92edc7aed52687f1cdf83784b44bd3 /epan/ftypes
parent4c898c3e74cd7a86ba5ddd3d425fb658640c2737 (diff)
ftypes: display BASE_HEX_DEC integers as hexadecimal
Bug: 11292 Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf Reviewed-on: https://code.wireshark.org/review/8987 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/ftypes')
-rw-r--r--epan/ftypes/ftype-integer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index d77cb1ec25..72257637f1 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -251,7 +251,7 @@ uinteger_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
static void
uinteger_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display, char *buf)
{
- if (field_display == BASE_HEX)
+ if ((field_display == BASE_HEX) || (field_display == BASE_HEX_DEC))
{
/* This format perfectly fits into 11 bytes. */
*buf++ = '0';
@@ -588,7 +588,7 @@ uinteger64_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
static void
uinteger64_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf)
{
- if (field_display == BASE_HEX)
+ if ((field_display == BASE_HEX) || (field_display == BASE_HEX_DEC))
{
/* This format perfectly fits into 19 bytes. */
*buf++ = '0';