diff options
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/ansi_x3.110.c | 2 | ||||
| -rw-r--r-- | iconvdata/big5.c | 2 | ||||
| -rw-r--r-- | iconvdata/big5hkscs.c | 4 | ||||
| -rw-r--r-- | iconvdata/cns11643.h | 2 | ||||
| -rw-r--r-- | iconvdata/gb18030.c | 2 | ||||
| -rw-r--r-- | iconvdata/iso-2022-cn-ext.c | 2 | ||||
| -rw-r--r-- | iconvdata/iso646.c | 2 | ||||
| -rw-r--r-- | iconvdata/iso_6937-2.c | 2 | ||||
| -rw-r--r-- | iconvdata/iso_6937.c | 2 | ||||
| -rw-r--r-- | iconvdata/t.61.c | 2 | ||||
| -rw-r--r-- | iconvdata/unicode.c | 2 | ||||
| -rw-r--r-- | iconvdata/utf-16.c | 2 |
12 files changed, 17 insertions, 9 deletions
diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c index ed312a0285..e1dd0ed0a7 100644 --- a/iconvdata/ansi_x3.110.c +++ b/iconvdata/ansi_x3.110.c @@ -474,7 +474,7 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if (__builtin_expect (ch, 0) \ + if ((size_t) __builtin_expect (ch, 0) \ >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ { \ if (ch == 0x2c7) \ diff --git a/iconvdata/big5.c b/iconvdata/big5.c index 442fc8f5c2..e06b44609e 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -8484,7 +8484,7 @@ static const char from_ucs4_tab15[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if (__builtin_expect (ch, 0) \ + if ((size_t) __builtin_expect (ch, 0) \ >= sizeof (from_ucs4_tab1) / sizeof (from_ucs4_tab1[0])) \ switch (ch) \ { \ diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c index 31122289fb..7f4a8c3bf2 100644 --- a/iconvdata/big5hkscs.c +++ b/iconvdata/big5hkscs.c @@ -11756,7 +11756,9 @@ static struct const char *cp = ""; \ int i; \ \ - for (i = 0; i < sizeof (from_ucs4_idx) / sizeof (from_ucs4_idx[0]); ++i) \ + for (i = 0; \ + i < (int) (sizeof (from_ucs4_idx) / sizeof (from_ucs4_idx[0])); \ + ++i) \ { \ if (ch < from_ucs4_idx[i].from) \ break; \ diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h index 8c73c06dff..176cb1feab 100644 --- a/iconvdata/cns11643.h +++ b/iconvdata/cns11643.h @@ -107,7 +107,7 @@ ucs4_to_cns11643 (uint32_t wch, char *s, size_t avail) unsigned int ch = (unsigned int) wch; char buf[2]; const char *cp = buf; - int needed = 2; + size_t needed = 2; switch (ch) { diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c index e412f481a3..02ace164b5 100644 --- a/iconvdata/gb18030.c +++ b/iconvdata/gb18030.c @@ -41825,7 +41825,7 @@ static const char __ucs_to_gb18030_tab63[][2] = #define LOOPFCT TO_LOOP #define BODY \ { \ - uint32_t ch = *((uint32_t *) inptr); \ + uint32_t ch = *((const uint32_t *) inptr); \ unsigned char buf[4]; \ const unsigned char *cp = buf; \ int len = 2; /* This is the most often case. */ \ diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index 20f889ee9d..d6ab2e8bbe 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -411,7 +411,7 @@ enum uint32_t ch; \ size_t written = 0; \ \ - ch = *((uint32_t *) inptr); \ + ch = *((const uint32_t *) inptr); \ \ /* First see whether we can write the character using the currently \ selected character set. */ \ diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index 4cfd98c106..8de2639574 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -122,6 +122,7 @@ struct iso646_data }; +extern int gconv_init (struct __gconv_step *step); int gconv_init (struct __gconv_step *step) { @@ -180,6 +181,7 @@ gconv_init (struct __gconv_step *step) } +extern void gconv_end (struct __gconv_step *data); void gconv_end (struct __gconv_step *data) { diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c index 01c0c5857b..5f8956e6b5 100644 --- a/iconvdata/iso_6937-2.c +++ b/iconvdata/iso_6937-2.c @@ -490,7 +490,7 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if (__builtin_expect (ch, 0) \ + if ((size_t) __builtin_expect (ch, 0) \ >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ { \ switch (ch) \ diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c index ccae483c12..74b899005a 100644 --- a/iconvdata/iso_6937.c +++ b/iconvdata/iso_6937.c @@ -482,7 +482,7 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if (__builtin_expect (ch, 0) \ + if ((size_t) __builtin_expect (ch, 0) \ >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ { \ int fail = 0; \ diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c index 17a22a3cd1..302226d8cc 100644 --- a/iconvdata/t.61.c +++ b/iconvdata/t.61.c @@ -457,7 +457,7 @@ static const char from_ucs4[][2] = uint32_t ch = get32 (inptr); \ const char *cp; \ \ - if (__builtin_expect (ch, 0) \ + if ((size_t) __builtin_expect (ch, 0) \ >= sizeof (from_ucs4) / sizeof (from_ucs4[0])) \ { \ if (__builtin_expect (ch, 0) == 0x2126) \ diff --git a/iconvdata/unicode.c b/iconvdata/unicode.c index b8ea905de3..be72f4fcaf 100644 --- a/iconvdata/unicode.c +++ b/iconvdata/unicode.c @@ -89,6 +89,7 @@ struct unicode_data }; +extern int gconv_init (struct __gconv_step *step); int gconv_init (struct __gconv_step *step) { @@ -135,6 +136,7 @@ gconv_init (struct __gconv_step *step) } +extern void gconv_end (struct __gconv_step *data); void gconv_end (struct __gconv_step *data) { diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c index 91e3390cba..c40e29685a 100644 --- a/iconvdata/utf-16.c +++ b/iconvdata/utf-16.c @@ -100,6 +100,7 @@ struct utf16_data }; +extern int gconv_init (struct __gconv_step *step); int gconv_init (struct __gconv_step *step) { @@ -180,6 +181,7 @@ gconv_init (struct __gconv_step *step) } +extern void gconv_end (struct __gconv_step *data); void gconv_end (struct __gconv_step *data) { |