diff options
| -rw-r--r-- | epan/ftypes/ftype-integer.c | 2 | ||||
| -rw-r--r-- | epan/to_str.c | 37 |
2 files changed, 20 insertions, 19 deletions
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c index e412a1e8f4..1fee4e255f 100644 --- a/epan/ftypes/ftype-integer.c +++ b/epan/ftypes/ftype-integer.c @@ -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) { - guint64_to_str_buf(fv->value.uinteger, buf, 21); + guint64_to_str_buf(fv->value.uinteger64, buf, 21); } static gboolean diff --git a/epan/to_str.c b/epan/to_str.c index ca72e2f104..cac5d57231 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -268,24 +268,25 @@ guint64_to_str_buf_len(const guint64 u) { /* ((2^64)-1) == 18446744073709551615 */ - if (u >= G_GUINT64_CONSTANT(1000000000000000000)) return 19; - if (u >= G_GUINT64_CONSTANT(100000000000000000)) return 18; - if (u >= G_GUINT64_CONSTANT(10000000000000000)) return 17; - if (u >= G_GUINT64_CONSTANT(1000000000000000)) return 16; - if (u >= G_GUINT64_CONSTANT(100000000000000)) return 15; - if (u >= G_GUINT64_CONSTANT(10000000000000)) return 14; - if (u >= G_GUINT64_CONSTANT(1000000000000)) return 13; - if (u >= G_GUINT64_CONSTANT(100000000000)) return 12; - if (u >= G_GUINT64_CONSTANT(10000000000)) return 11; - if (u >= G_GUINT64_CONSTANT(1000000000)) return 10; - if (u >= G_GUINT64_CONSTANT(100000000)) return 9; - if (u >= G_GUINT64_CONSTANT(10000000)) return 8; - if (u >= G_GUINT64_CONSTANT(1000000)) return 7; - if (u >= G_GUINT64_CONSTANT(100000)) return 6; - if (u >= G_GUINT64_CONSTANT(10000)) return 5; - if (u >= G_GUINT64_CONSTANT(1000)) return 4; - if (u >= G_GUINT64_CONSTANT(100)) return 3; - if (u >= G_GUINT64_CONSTANT(10)) return 2; + if (u >= G_GUINT64_CONSTANT(10000000000000000000)) return 20; + if (u >= G_GUINT64_CONSTANT(1000000000000000000)) return 19; + if (u >= G_GUINT64_CONSTANT(100000000000000000)) return 18; + if (u >= G_GUINT64_CONSTANT(10000000000000000)) return 17; + if (u >= G_GUINT64_CONSTANT(1000000000000000)) return 16; + if (u >= G_GUINT64_CONSTANT(100000000000000)) return 15; + if (u >= G_GUINT64_CONSTANT(10000000000000)) return 14; + if (u >= G_GUINT64_CONSTANT(1000000000000)) return 13; + if (u >= G_GUINT64_CONSTANT(100000000000)) return 12; + if (u >= G_GUINT64_CONSTANT(10000000000)) return 11; + if (u >= G_GUINT64_CONSTANT(1000000000)) return 10; + if (u >= G_GUINT64_CONSTANT(100000000)) return 9; + if (u >= G_GUINT64_CONSTANT(10000000)) return 8; + if (u >= G_GUINT64_CONSTANT(1000000)) return 7; + if (u >= G_GUINT64_CONSTANT(100000)) return 6; + if (u >= G_GUINT64_CONSTANT(10000)) return 5; + if (u >= G_GUINT64_CONSTANT(1000)) return 4; + if (u >= G_GUINT64_CONSTANT(100)) return 3; + if (u >= G_GUINT64_CONSTANT(10)) return 2; return 1; } |