Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9ec0339 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Linus Torvalds
Browse files

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: default avatarDenys Vlasenko <vda.linux@googlemail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37c42524

fs/nls/nls_ascii.c

+6 −6
Original line number Diff line number Diff line
@@ -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,
@@ -56,7 +56,7 @@ static wchar_t charset2uni[256] = { 
	0x007c, 0x007d, 0x007e, 0x007f,

};



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 */
@@ -75,11 +75,11 @@ static unsigned char page00[256] = { 
	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 0x78-0x7f */

};



static unsigned char *page_uni2charset[256] = {

static const unsigned char *const page_uni2charset[256] = {

	page00,

};



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 */
@@ -98,7 +98,7 @@ static unsigned char charset2lower[256] = { 
	0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, /* 0x78-0x7f */

};



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 */
@@ -119,7 +119,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;

fs/nls/nls_base.c

+9 −9
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct utf8_table { 
	long    lval;

};



static struct utf8_table utf8_table[] =

static const struct utf8_table utf8_table[] =

{

    {0x80,  0x00,   0*6,    0x7F,           0,         /* 1 byte sequence */},

    {0xE0,  0xC0,   1*6,    0x7FF,          0x80,      /* 2 byte sequence */},
@@ -50,7 +50,7 @@ utf8_mbtowc(wchar_t *p, const __u8 *s, int n) 
{

	long l;

	int c0, c, nc;

	struct utf8_table *t;

	const struct utf8_table *t;

  

	nc = 0;

	c0 = *s;
@@ -109,7 +109,7 @@ utf8_wctomb(__u8 *s, wchar_t wc, int maxlen) 
{

	long l;

	int c, nc;

	struct utf8_table *t;

	const struct utf8_table *t;

  

	if (s == 0)

		return 0;
@@ -240,7 +240,7 @@ void unload_nls(struct nls_table *nls) 
	module_put(nls->owner);

}



static wchar_t charset2uni[256] = {

static const wchar_t charset2uni[256] = {

	/* 0x00*/

	0x0000, 0x0001, 0x0002, 0x0003,

	0x0004, 0x0005, 0x0006, 0x0007,
@@ -323,7 +323,7 @@ static wchar_t charset2uni[256] = { 
	0x00fc, 0x00fd, 0x00fe, 0x00ff,

};



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 */
@@ -359,11 +359,11 @@ static unsigned char page00[256] = { 
	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, /* 0xf8-0xff */

};



static unsigned char *page_uni2charset[256] = {

static const unsigned char *const page_uni2charset[256] = {

	page00

};



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 */
@@ -399,7 +399,7 @@ static unsigned char charset2lower[256] = { 
	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 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 */
@@ -438,7 +438,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;

fs/nls/nls_cp1250.c

+10 −10
Original line number Diff line number Diff line
@@ -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] = { 
	0x00fc, 0x00fd, 0x0163, 0x02d9, 

	};



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 */
@@ -132,7 +132,7 @@ static unsigned char page00[256] = { 
	0x00, 0x00, 0xfa, 0x00, 0xfc, 0xfd, 0x00, 0x00, /* 0xf8-0xff */

	};



static unsigned char page01[256] = {

static const unsigned char page01[256] = {

	0x00, 0x00, 0xc3, 0xe3, 0xa5, 0xb9, 0xc6, 0xe6, /* 0x00-0x07 */

	0x00, 0x00, 0x00, 0x00, 0xc8, 0xe8, 0xcf, 0xef, /* 0x08-0x0f */

	0xd0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10-0x17 */
@@ -152,7 +152,7 @@ static unsigned char page01[256] = { 


	};



static unsigned char page02[256] = {

static const unsigned char page02[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, 0x00, 0x00, /* 0x10-0x17 */
@@ -184,7 +184,7 @@ static unsigned char page02[256] = { 
	0xa2, 0xff, 0x00, 0xb2, 0x00, 0xbd, 0x00, 0x00, /* 0xd8-0xdf */

	};



static unsigned char page20[256] = {

static const unsigned char page20[256] = {

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */

	0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
@@ -210,7 +210,7 @@ static unsigned char page20[256] = { 
	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, /* 0xa8-0xaf */

	};



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, 0x00, 0x00, /* 0x10-0x17 */
@@ -218,7 +218,7 @@ static unsigned char page21[256] = { 
	0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */

	};



static unsigned char *page_uni2charset[256] = {

static const unsigned char *const page_uni2charset[256] = {

	page00,	page01,	page02,	NULL,	NULL,	NULL,	NULL,	NULL,

	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,

	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,	NULL,
@@ -226,7 +226,7 @@ static unsigned char *page_uni2charset[256] = { 
	page20,	page21,	NULL,	NULL,	NULL,	NULL,	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 */
@@ -262,7 +262,7 @@ static unsigned char charset2lower[256] = { 
	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 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 */
@@ -300,7 +300,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;

fs/nls/nls_cp1251.c

+9 −9
Original line number Diff line number Diff line
@@ -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] = { 
	0x044c, 0x044d, 0x044e, 0x044f, 

};



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 */
@@ -132,7 +132,7 @@ static unsigned char page00[256] = { 
	0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */

};



static unsigned char page04[256] = {

static const unsigned char page04[256] = {

	0x00, 0xa8, 0x80, 0x81, 0xaa, 0xbd, 0xb2, 0xaf, /* 0x00-0x07 */

	0xa3, 0x8a, 0x8c, 0x8e, 0x8d, 0x00, 0xa1, 0x8f, /* 0x08-0x0f */

	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x10-0x17 */
@@ -155,7 +155,7 @@ static unsigned char page04[256] = { 
	0x00, 0xa5, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */

};



static unsigned char page20[256] = {

static const unsigned char page20[256] = {

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08-0x0f */

	0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
@@ -166,7 +166,7 @@ static unsigned char page20[256] = { 
	0x00, 0x8b, 0x9b, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x38-0x3f */

};



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, 0xb9, 0x00, /* 0x10-0x17 */
@@ -174,7 +174,7 @@ static unsigned char page21[256] = { 
	0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */

};



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,
@@ -182,7 +182,7 @@ static unsigned char *page_uni2charset[256] = { 
	page20, page21, NULL,	NULL,   NULL,   NULL,   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 */
@@ -217,7 +217,7 @@ static unsigned char charset2lower[256] = { 
	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 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 */
@@ -254,7 +254,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;

fs/nls/nls_cp1255.c

+11 −11
Original line number Diff line number Diff line
@@ -11,7 +11,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,
@@ -94,7 +94,7 @@ static wchar_t charset2uni[256] = { 
	0x0000, 0x0000, 0x0000, 0x0000,

};



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 */
@@ -129,7 +129,7 @@ static unsigned char page00[256] = { 
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xba, /* 0xf0-0xf7 */

};



static unsigned char page01[256] = {

static const unsigned char page01[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, 0x00, 0x00, /* 0x10-0x17 */
@@ -152,7 +152,7 @@ static unsigned char page01[256] = { 
	0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90-0x97 */

};



static unsigned char page02[256] = {

static const unsigned char page02[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, 0x00, 0x00, /* 0x10-0x17 */
@@ -184,7 +184,7 @@ static unsigned char page02[256] = { 
	0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00, /* 0xd8-0xdf */

};



static unsigned char page05[256] = {

static const unsigned char page05[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, 0x00, 0x00, /* 0x10-0x17 */
@@ -219,7 +219,7 @@ static unsigned char page05[256] = { 
	0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0x00, 0x00, 0x00, /* 0xf0-0xf7 */

};



static unsigned char page20[256] = {

static const unsigned char page20[256] = {

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00-0x07 */

	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfe, /* 0x08-0x0f */

	0x00, 0x00, 0x00, 0x96, 0x97, 0x00, 0x00, 0x00, /* 0x10-0x17 */
@@ -245,7 +245,7 @@ static unsigned char page20[256] = { 
	0x00, 0x00, 0xa4, 0x00, 0x80, 0x00, 0x00, 0x00, /* 0xa8-0xaf */

};



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, 0xb9, 0x00, /* 0x10-0x17 */
@@ -253,7 +253,7 @@ static unsigned char page21[256] = { 
	0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x20-0x27 */

};



static unsigned char *page_uni2charset[256] = {

static const unsigned char *const page_uni2charset[256] = {

	page00, page01, page02, NULL,   NULL,   page05, NULL,   NULL,   

	NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   

	NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,
@@ -261,7 +261,7 @@ static unsigned char *page_uni2charset[256] = { 
	page20, page21, NULL,   NULL,   NULL,   NULL,   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 */
@@ -297,7 +297,7 @@ static unsigned char charset2lower[256] = { 
	0xf8, 0xf9, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, /* 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 */
@@ -335,7 +335,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;