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

merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 19 Nov 2011 14:42:54 +0900
parents 0f94ec89f0bc 5525312cf589
children
comparison
equal deleted inserted replaced
32692:0f94ec89f0bc 32827:4a34689eeb33
3357 3357
3358 return ret; 3358 return ret;
3359 } 3359 }
3360 3360
3361 char * 3361 char *
3362 purple_str_size_to_units(size_t size) 3362 purple_str_size_to_units(goffset size)
3363 { 3363 {
3364 static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB" }; 3364 static const char * const size_str[] = { "bytes", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB" };
3365 float size_mag; 3365 float size_mag;
3366 int size_index = 0; 3366 int size_index = 0;
3367 3367
3368 if (size == -1) { 3368 if (size == -1) {
3369 return g_strdup(_("Calculating...")); 3369 return g_strdup(_("Calculating..."));
3372 return g_strdup(_("Unknown.")); 3372 return g_strdup(_("Unknown."));
3373 } 3373 }
3374 else { 3374 else {
3375 size_mag = (float)size; 3375 size_mag = (float)size;
3376 3376
3377 while ((size_index < 3) && (size_mag > 1024)) { 3377 while ((size_index < G_N_ELEMENTS(size_str) - 1) && (size_mag > 1024)) {
3378 size_mag /= 1024; 3378 size_mag /= 1024;
3379 size_index++; 3379 size_index++;
3380 } 3380 }
3381 3381
3382 if (size_index == 0) { 3382 if (size_index == 0) {