add consts where appropriate in fs/nls/*
Add const modifiers to a few struct nls_table's member pointers in include/linux/nls.h and adds a lot of const's in fs/nls/*.c files. Resulting changes as visible by size: text data bss dec hex filename 113612 481216 2368 597196 91ccc nls.org/built-in.o 593548 3296 288 597132 91c8c nls/built-in.o Apparently compiler managed to optimize code a bit better because of const-ness. No other changes are made. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
37c42524d6
commit
b9ec0339d8
@@ -13,7 +13,7 @@
|
||||
#include <linux/nls.h>
|
||||
#include <linux/errno.h>
|
||||
|
||||
static wchar_t charset2uni[256] = {
|
||||
static const wchar_t charset2uni[256] = {
|
||||
/* 0x00*/
|
||||
0x0000, 0x0001, 0x0002, 0x0003,
|
||||
0x0004, 0x0005, 0x0006, 0x0007,
|
||||
@@ -96,7 +96,7 @@ static wchar_t charset2uni[256] = {
|
||||
0x0427, 0x00a7, 0x25a0, 0x00a0,
|
||||
};
|
||||
|
||||
static unsigned char page00[256] = {
|
||||
static const unsigned char page00[256] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
|
||||
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
|
||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
|
||||
@@ -124,7 +124,7 @@ static unsigned char page00[256] = {
|
||||
0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x00, /* 0xb8-0xbf */
|
||||
};
|
||||
|
||||
static unsigned char page04[256] = {
|
||||
static const unsigned char page04[256] = {
|
||||
0x00, 0x85, 0x81, 0x83, 0x87, 0x89, 0x8b, 0x8d, /* 0x00-0x07 */
|
||||
0x8f, 0x91, 0x93, 0x95, 0x97, 0x00, 0x99, 0x9b, /* 0x08-0x0f */
|
||||
0xa1, 0xa3, 0xec, 0xad, 0xa7, 0xa9, 0xea, 0xf4, /* 0x10-0x17 */
|
||||
@@ -139,13 +139,13 @@ static unsigned char page04[256] = {
|
||||
0x8e, 0x90, 0x92, 0x94, 0x96, 0x00, 0x98, 0x9a, /* 0x58-0x5f */
|
||||
};
|
||||
|
||||
static unsigned char page21[256] = {
|
||||
static const unsigned char page21[256] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0x00, /* 0x10-0x17 */
|
||||
};
|
||||
|
||||
static unsigned char page25[256] = {
|
||||
static const unsigned char page25[256] = {
|
||||
0xc4, 0x00, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */
|
||||
0x00, 0x00, 0x00, 0x00, 0xda, 0x00, 0x00, 0x00, /* 0x08-0x0f */
|
||||
0xbf, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, /* 0x10-0x17 */
|
||||
@@ -170,7 +170,7 @@ static unsigned char page25[256] = {
|
||||
0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa0-0xa7 */
|
||||
};
|
||||
|
||||
static unsigned char *page_uni2charset[256] = {
|
||||
static const unsigned char *const page_uni2charset[256] = {
|
||||
page00, NULL, NULL, NULL, page04, NULL, NULL, NULL,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
|
||||
@@ -178,7 +178,7 @@ static unsigned char *page_uni2charset[256] = {
|
||||
NULL, page21, NULL, NULL, NULL, page25, NULL, NULL,
|
||||
};
|
||||
|
||||
static unsigned char charset2lower[256] = {
|
||||
static const unsigned char charset2lower[256] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
|
||||
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
|
||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
|
||||
@@ -214,7 +214,7 @@ static unsigned char charset2lower[256] = {
|
||||
0xf7, 0xf9, 0xf9, 0xfb, 0xfb, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */
|
||||
};
|
||||
|
||||
static unsigned char charset2upper[256] = {
|
||||
static const unsigned char charset2upper[256] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /* 0x00-0x07 */
|
||||
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* 0x08-0x0f */
|
||||
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* 0x10-0x17 */
|
||||
@@ -252,7 +252,7 @@ static unsigned char charset2upper[256] = {
|
||||
|
||||
static int uni2char(wchar_t uni, unsigned char *out, int boundlen)
|
||||
{
|
||||
unsigned char *uni2charset;
|
||||
const unsigned char *uni2charset;
|
||||
unsigned char cl = uni & 0x00ff;
|
||||
unsigned char ch = (uni & 0xff00) >> 8;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user