diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-18 10:34:20 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-18 18:37:34 +0000 |
| commit | dd151914097acddb417fdcafd38c71f918e96cac (patch) | |
| tree | 5c3c40397025044abc825d0c076c84bba6c1773b /wsutil/str_util.c | |
| parent | 0dd7714d4da9824cc1294d6e200dfc9f44fba182 (diff) | |
| download | wireshark-dd151914097acddb417fdcafd38c71f918e96cac.tar.gz | |
Suppress a printf grouping warning.
Suppress
warning: ISO C does not support the ''' printf flag [-Wformat=]
We verify that we *do* support it via HAVE_GLIB_PRINTF_GROUPING.
Change-Id: Iedcf1d1856238e05babde5fe8ec23f64fbf2cdcf
Reviewed-on: https://code.wireshark.org/review/7238
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wsutil/str_util.c')
| -rw-r--r-- | wsutil/str_util.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wsutil/str_util.c b/wsutil/str_util.c index da33c4cfb4..ad63e477bf 100644 --- a/wsutil/str_util.c +++ b/wsutil/str_util.c @@ -23,6 +23,7 @@ #include "config.h" #include "str_util.h" +#include "ws_diag_control.h" int ws_xton(char ch) @@ -135,6 +136,7 @@ format_size(gint64 size, format_size_flags_e flags) power = 1024; } +DIAG_OFF(format=) if (size / power / power / power / power >= 10) { g_string_printf(human_str, "%" GROUP_FLAG G_GINT64_MODIFIER "d %s", size / power / power / power / power, prefix[pfx_off]); } else if (size / power / power / power >= 10) { @@ -147,6 +149,7 @@ format_size(gint64 size, format_size_flags_e flags) g_string_printf(human_str, "%" GROUP_FLAG G_GINT64_MODIFIER "d", size); is_small = TRUE; } +DIAG_ON(format=) switch (flags & FORMAT_SIZE_UNIT_MASK) { case format_size_unit_none: |