From 7eda722de5ee2e56f6590641e190ddc66fb60eb5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Dec 1999 08:41:33 +0000 Subject: Update. 1999-12-07 Jakub Jelinek * string/bits/string2.h (__memset_gc, __mempcpy_small, __strcpy_small, __stpcpy_small): Cast switch expressions to int to shut up compiler warnings. --- ChangeLog | 6 ++++++ localedata/charmaps/CP1258 | 1 + localedata/charmaps/IBM864 | 6 ++++++ localedata/charmaps/IBM874 | 1 + localedata/charmaps/ISO-8859-7 | 2 +- localedata/charmaps/KOI8-R | 2 +- localedata/charmaps/KOI8-U | 2 +- localedata/repertoiremaps/mnemonic.ds | 8 ++++++++ string/bits/string2.h | 14 +++++++------- 9 files changed, 32 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index d11c0d1..8872df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-12-07 Jakub Jelinek + + * string/bits/string2.h (__memset_gc, __mempcpy_small, __strcpy_small, + __stpcpy_small): Cast switch expressions to int to shut up compiler + warnings. + 1999-12-07 Scott Bambrough * sysdeps/arm/dl-machine.h (elf_machine_rel): Fixup R_ARM_PC24 diff --git a/localedata/charmaps/CP1258 b/localedata/charmaps/CP1258 index de6aaf9..de67c87 100644 --- a/localedata/charmaps/CP1258 +++ b/localedata/charmaps/CP1258 @@ -325,6 +325,7 @@ CHARMAP /xE9 LATIN SMALL LETTER E WITH ACUTE > /xEA LATIN SMALL LETTER E WITH CIRCUMFLEX /xEB LATIN SMALL LETTER E WITH DIAERESIS +<"'> /xEC COMBINING ACUTE ACCENT /xED LATIN SMALL LETTER I WITH ACUTE > /xEE LATIN SMALL LETTER I WITH CIRCUMFLEX /xEF LATIN SMALL LETTER I WITH DIAERESIS diff --git a/localedata/charmaps/IBM864 b/localedata/charmaps/IBM864 index c647ce9..fdef1cd 100644 --- a/localedata/charmaps/IBM864 +++ b/localedata/charmaps/IBM864 @@ -80,6 +80,7 @@ CHARMAP /x24 DOLLAR SIGN /x24 DOLLAR SIGN /x24 DOLLAR SIGN +<%a> /x25 ARABIC PERCENT SIGN <&> /x26 AMPERSAND /x26 AMPERSAND <'> /x27 APOSTROPHE @@ -292,7 +293,12 @@ CHARMAP /xBF ARABIC QUESTION MARK /xC0 CENT SIGN /xC0 CENT SIGN + /xC1 ARABIC LETTER HAMZA ISOLATED FORM + /xC2 ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM + /xC3 ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM + /xC4 ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM /xC5 ARABIC LETTER AIN FINAL FORM + /xC6 ARABIC LETTER ALEF ISOLATED FORM /xC7 ARABIC LETTER ALEF ISOLATED FORM /xC8 ARABIC LETTER BEH INITIAL FORM /xC9 ARABIC LETTER TEH MARBUTA ISOLATED FORM diff --git a/localedata/charmaps/IBM874 b/localedata/charmaps/IBM874 index 3ef0573..677e1ea 100644 --- a/localedata/charmaps/IBM874 +++ b/localedata/charmaps/IBM874 @@ -220,6 +220,7 @@ CHARMAP /x7E TILDE /x7F DELETE
/x7F DELETE + /x80 EURO SIGN <.3> /x85 HORIZONTAL ELLIPSIS <'6> /x91 LEFT SINGLE QUOTATION MARK <'9> /x92 RIGHT SINGLE QUOTATION MARK diff --git a/localedata/charmaps/ISO-8859-7 b/localedata/charmaps/ISO-8859-7 index e602ec6..aeab854 100644 --- a/localedata/charmaps/ISO-8859-7 +++ b/localedata/charmaps/ISO-8859-7 @@ -189,7 +189,7 @@ CHARMAP <+-> /xB1 PLUS-MINUS SIGN <2S> /xB2 SUPERSCRIPT TWO <3S> /xB3 SUPERSCRIPT THREE -<''> /xB4 ACUTE ACCENT +<'*> /xB4 GREEK TONOS <'%> /xB5 GREEK DIALYTIKA TONOS /xB6 GREEK CAPITAL LETTER ALPHA WITH TONOS <.M> /xB7 MIDDLE DOT diff --git a/localedata/charmaps/KOI8-R b/localedata/charmaps/KOI8-R index 2ff2d43..507c1c8 100644 --- a/localedata/charmaps/KOI8-R +++ b/localedata/charmaps/KOI8-R @@ -157,7 +157,7 @@ CHARMAP /x92 DARK SHADE /x93 TOP HALF INTEGRAL /x94 BLACK SQUARE - /x95 BULLET + /x95 BULLET OPERATOR /x96 SQUARE ROOT /x97 ALMOST EQUAL TO <=<> /x98 LESS-THAN OR EQUAL TO diff --git a/localedata/charmaps/KOI8-U b/localedata/charmaps/KOI8-U index 12fd0a7..d860962 100644 --- a/localedata/charmaps/KOI8-U +++ b/localedata/charmaps/KOI8-U @@ -156,7 +156,7 @@ CHARMAP /x92 DARK SHADE /x93 TOP HALF INTEGRAL /x94 BLACK SQUARE - /x95 BULLET OPERATOR + /x95 BULLET OPERATOR /x96 SQUARE ROOT /x97 ALMOST EQUAL TO <=<> /x98 LESS THAN OR EQUAL TO diff --git a/localedata/repertoiremaps/mnemonic.ds b/localedata/repertoiremaps/mnemonic.ds index e64bed9..c05332f 100644 --- a/localedata/repertoiremaps/mnemonic.ds +++ b/localedata/repertoiremaps/mnemonic.ds @@ -589,6 +589,8 @@ escape_char / <';> OGONEK <1?> SMALL TILDE <'"> DOUBLE ACUTE ACCENT +<"`> COMBINING GRAVE ACCENT +<"'> COMBINING ACUTE ACCENT <'G> GREEK NUMERAL SIGN <,G> GREEK LOWER NUMERAL SIGN GREEK YPOGEGRAMMENI @@ -859,6 +861,7 @@ escape_char / <7a> ARABIC-INDIC DIGIT SEVEN <8a> ARABIC-INDIC DIGIT EIGHT <9a> ARABIC-INDIC DIGIT NINE +<%a> ARABIC PERCENT SIGN ARABIC LETTER SUPERSCRIPT ALEF ARABIC LETTER PEH ARABIC LETTER HAH WITH HAMZA ABOVE @@ -2173,9 +2176,14 @@ escape_char / LATIN SMALL LIGATURE LONG S T LATIN SMALL LIGATURE ST <3+;> ARABIC SHADDA MEDIAL FORM + ARABIC LETTER HAMZA ISOLATED FORM + ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM + ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM + ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM + ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM ARABIC LETTER ALEF ISOLATED FORM ARABIC LETTER ALEF FINAL FORM ARABIC LETTER BEH ISOLATED FORM diff --git a/string/bits/string2.h b/string/bits/string2.h index 5c4777d..4d1baa2 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -118,7 +118,7 @@ __STRING2_COPY_TYPE (8); __uint8_t __c = (__uint8_t) (c); \ \ /* This `switch' statement will be removed at compile-time. */ \ - switch (n) \ + switch ((unsigned int) n) \ { \ case 15: \ __u->__ui = __c * 0x01010101; \ @@ -230,7 +230,7 @@ __mempcpy_small (void *__dest1, unsigned char __uc; unsigned char __c; } *__u = __dest1; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = __src0_1; @@ -332,7 +332,7 @@ __mempcpy_small (void *__dest, char __src1, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = __src1; @@ -405,7 +405,7 @@ __strcpy_small (char *__dest, __uint16_t __usi; unsigned char __uc; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__uc = '\0'; @@ -498,7 +498,7 @@ __strcpy_small (char *__dest, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = '\0'; @@ -565,7 +565,7 @@ __stpcpy_small (char *__dest, unsigned char __uc; char __c; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__uc = '\0'; @@ -662,7 +662,7 @@ __stpcpy_small (char *__dest, __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; } *__u = (void *) __dest; - switch (__srclen) + switch ((unsigned int) __srclen) { case 1: __u->__c = '\0'; -- cgit v1.1