diff libpurple/util.c @ 32827:4a34689eeb33 default tip

merged from im.pidgin.pidgin

--- a/libpurple/util.c	Mon Sep 26 14:57:21 2011 +0900
+++ b/libpurple/util.c	Sat Nov 19 14:42:54 2011 +0900
@@ -3359,9 +3359,9 @@
 }
 
 char *
-purple_str_size_to_units(size_t size)
+purple_str_size_to_units(goffset size)
 {
-	static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB" };
+	static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB" };
 	float size_mag;
 	int size_index = 0;
 
@@ -3374,7 +3374,7 @@
 	else {
 		size_mag = (float)size;
 
-		while ((size_index < 3) && (size_mag > 1024)) {
+		while ((size_index < G_N_ELEMENTS(size_str) - 1) && (size_mag > 1024)) {
 			size_mag /= 1024;
 			size_index++;
 		}