diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
| commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
| tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /lib/string_helpers.c | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| parent | 042e1c79166b9250edd8262bea84e1703f27ad2e (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'lib/string_helpers.c')
| -rw-r--r-- | lib/string_helpers.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index ed5c1454dd62..29033f319aea 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c | |||
| @@ -25,12 +25,15 @@ | |||
| 25 | int string_get_size(u64 size, const enum string_size_units units, | 25 | int string_get_size(u64 size, const enum string_size_units units, |
| 26 | char *buf, int len) | 26 | char *buf, int len) |
| 27 | { | 27 | { |
| 28 | static const char *units_10[] = { "B", "kB", "MB", "GB", "TB", "PB", | 28 | static const char *const units_10[] = { |
| 29 | "EB", "ZB", "YB", NULL}; | 29 | "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL |
| 30 | static const char *units_2[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB", | 30 | }; |
| 31 | "EiB", "ZiB", "YiB", NULL }; | 31 | static const char *const units_2[] = { |
| 32 | static const char **units_str[] = { | 32 | "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", |
| 33 | [STRING_UNITS_10] = units_10, | 33 | NULL |
| 34 | }; | ||
| 35 | static const char *const *const units_str[] = { | ||
| 36 | [STRING_UNITS_10] = units_10, | ||
| 34 | [STRING_UNITS_2] = units_2, | 37 | [STRING_UNITS_2] = units_2, |
| 35 | }; | 38 | }; |
| 36 | static const unsigned int divisor[] = { | 39 | static const unsigned int divisor[] = { |