osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Anders: revert r47934: it doesn't work everywhere. 

See email discussion on -dev.

svn path=/trunk/; revision=47940
This commit is contained in:
Jeff Morriss 2013-02-28 15:16:46 +00:00
parent 4e2090bdc9
commit 98ea7d3a8d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wsutil/str_util.c
View File

@ -107,15 +107,15 @@ gchar *format_size(gint64 size, format_size_flags_e flags) {
}
if (size / power / power / power / power >= 10) {
g_string_printf(human_str, "%'" G_GINT64_MODIFIER "d %s", size / power / power / power / power, prefix[pfx_off]);
g_string_printf(human_str, "%" G_GINT64_MODIFIER "d %s", size / power / power / power / power, prefix[pfx_off]);
} else if (size / power / power / power >= 10) {
g_string_printf(human_str, "%'" G_GINT64_MODIFIER "d %s", size / power / power / power, prefix[pfx_off+1]);
g_string_printf(human_str, "%" G_GINT64_MODIFIER "d %s", size / power / power / power, prefix[pfx_off+1]);
} else if (size / power / power >= 10) {
g_string_printf(human_str, "%'" G_GINT64_MODIFIER "d %s", size / power / power, prefix[pfx_off+2]);
g_string_printf(human_str, "%" G_GINT64_MODIFIER "d %s", size / power / power, prefix[pfx_off+2]);
} else if (size / power >= 10) {
g_string_printf(human_str, "%'" G_GINT64_MODIFIER "d %s", size / power, prefix[pfx_off+3]);
g_string_printf(human_str, "%" G_GINT64_MODIFIER "d %s", size / power, prefix[pfx_off+3]);
} else {
g_string_printf(human_str, "%'" G_GINT64_MODIFIER "d ", size);
g_string_printf(human_str, "%" G_GINT64_MODIFIER "d ", size);
is_small = TRUE;
}