lib/string_helpers.c: constify static arrays
Complement commit 68aecfb979
("lib/string_helpers.c: make arrays
static") by making the arrays const -- not only pointing to const
strings. This moves them out of the data section to the r/o data
section:
text data bss dec hex filename
1150 176 0 1326 52e lib/string_helpers.old.o
1326 0 0 1326 52e lib/string_helpers.new.o
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e004f3c778
commit
142cda5dbc
|
@ -25,11 +25,14 @@
|
||||||
int string_get_size(u64 size, const enum string_size_units units,
|
int string_get_size(u64 size, const enum string_size_units units,
|
||||||
char *buf, int len)
|
char *buf, int len)
|
||||||
{
|
{
|
||||||
static const char *units_10[] = { "B", "kB", "MB", "GB", "TB", "PB",
|
static const char *const units_10[] = {
|
||||||
"EB", "ZB", "YB", NULL};
|
"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL
|
||||||
static const char *units_2[] = {"B", "KiB", "MiB", "GiB", "TiB", "PiB",
|
};
|
||||||
"EiB", "ZiB", "YiB", NULL };
|
static const char *const units_2[] = {
|
||||||
static const char **units_str[] = {
|
"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB",
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
static const char *const *const units_str[] = {
|
||||||
[STRING_UNITS_10] = units_10,
|
[STRING_UNITS_10] = units_10,
|
||||||
[STRING_UNITS_2] = units_2,
|
[STRING_UNITS_2] = units_2,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue