2003-07-31 Jeff Johnston <jjohnstn@redhat.com>

        * libc/ctype/iswalpha.c: Fix calls to __jp2uc to pass the
        correct type of conversion when dealing with EUCJP or SJIS.
        * libc/ctype/iswblank.c: Ditto.
        * libc/ctype/iswcntrl.c: Ditto.
        * libc/ctype/iswprint.c: Ditto.
        * libc/ctype/iswpunct.c: Ditto.
        * libc/ctype/iswspace.c: Ditto.
        * libc/ctype/towlower.c: Ditto.
        * libc/ctype/towupper.c: Ditto.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index dc96716..b8b1905 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-31  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * libc/ctype/iswalpha.c: Fix calls to __jp2uc to pass the
+       correct type of conversion when dealing with EUCJP or SJIS.
+       * libc/ctype/iswblank.c: Ditto.
+       * libc/ctype/iswcntrl.c: Ditto.
+       * libc/ctype/iswprint.c: Ditto.
+       * libc/ctype/iswpunct.c: Ditto.
+       * libc/ctype/iswspace.c: Ditto.
+       * libc/ctype/towlower.c: Ditto.
+       * libc/ctype/towupper.c: Ditto.
+
 2003-07-31  Nick Clifton  <nickc@redhat.com>
 
        * libc/sys/sysnecv850/crt0.S (_start): Allocate 4 slots on stack

diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 4fed96c..97fda7f 100644 (file)
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -82,12 +82,12 @@ _DEFUN(iswalpha,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index 069b737..8834e95 100644 (file)
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -78,12 +78,12 @@ _DEFUN(iswblank,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index 5935431..b33af01 100644 (file)
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -78,12 +78,12 @@ _DEFUN(iswcntrl,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index c30938f..5acba9c 100644 (file)
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -82,12 +82,12 @@ _DEFUN(iswprint,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index 3e577d6..716fe5f 100644 (file)
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -82,12 +82,12 @@ _DEFUN(iswpunct,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index d8f6b58..cd3d85a 100644 (file)
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -78,12 +78,12 @@ _DEFUN(iswspace,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index 5520e37..a0b03b8 100644 (file)
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -83,12 +83,12 @@ _DEFUN(towlower,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))

diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index 8fc2848..b14e5aa 100644 (file)
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -83,12 +83,12 @@ _DEFUN(towupper,(c), wint_t c)
     }
   else if (!strcmp (__lc_ctype, "C-SJIS"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_SJIS);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-EUCJP"))
     {
-      c = __jp2uc (c, JP_JIS);
+      c = __jp2uc (c, JP_EUCJP);
       unicode = 1;
     }
   else if (!strcmp (__lc_ctype, "C-UTF-8"))