Changeset 153 for trunk/src/helpers/encodings.c

Timestamp:

Apr 14, 2002, 1:42:05 AM (23 years ago)

Author:

umoeller

Message:

Lots of changes from the last three weeks.

File:

• trunk/src/helpers/encodings.c (modified) (5 diffs)

trunk/src/helpers/encodings.c

@@ -41 +41 @@
 #pragma hdrstop
 
-#define ENCODINGENTRY(id)   enc_ ## id, G_ ## id, ARRAYITEMCOUNT(G_ ## id)
-
 /*
  *@@ G_aEncodings:
@@ -65 +63 @@
 } G_aEncodings[] =
     {
+        #define ENCODINGENTRY(id)   enc_ ## id, G_ ## id, ARRAYITEMCOUNT(G_ ## id)
+
         ENCODINGENTRY(cp437), 437, SINGLE, "DOS Latin US",
         ENCODINGENTRY(cp737), 737, SINGLE, "DOS Greek",
@@ -82 +82 @@
         ENCODINGENTRY(cp869), 869, SINGLE, "DOS Greek2",
         ENCODINGENTRY(cp874), 874, SINGLE, "DOS Thai (TIS-620)",        // default in Thailand
-        // ENCODINGENTRY(cp932), 932 or 943?, DOUBLE, "Japanese Windows",
-        // ENCODINGENTRY(cp936), 936 or 946?, DOUBLE, "Chinese",
-        // ENCODINGENTRY(cp949), 951 or 949?, DOUBLE, "Korean",
-        // ENCODINGENTRY(cp950), 947 or 950?, DOUBLE, "Taiwan Big-5",           // default in China?
+
+        ENCODINGENTRY(cp932), 932 /* or 943?*/ , DOUBLE, "Japanese Windows",
+        ENCODINGENTRY(cp936), 936 /* or 946?*/ , DOUBLE, "Chinese",
+        ENCODINGENTRY(cp949), 951 /* or 949?*/ , DOUBLE, "Korean",
+        ENCODINGENTRY(cp950), 947 /* or 950?*/ , DOUBLE, "Taiwan Big-5",           // default in China?
+
         ENCODINGENTRY(cp1004), 1004, SINGLE, "Windows Extended",
         ENCODINGENTRY(cp1250), 1250, SINGLE, "Windows Latin 2",
@@ -404 +406 @@
 unsigned long encDecodeUTF8(const char **ppch)
 {
-    unsigned long   ulChar = **ppch;
-
-    if (!ulChar)
+    unsigned long   ulChar;
+
+    if (!(ulChar = **ppch))
+        // null is null
         return 0;
 
     // if (ulChar < 0x80): simple, one byte only... use that
 
-    if (ulChar >= 0x80)
+    if (ulChar < 0x80)
+    {
+        (*ppch)++;
+        return (ulChar);
+    }
+    else
     {
         unsigned long ulCount = 1;
@@ -490 +498 @@
             *ppch += ulCount;
     }
-    else
-        (*ppch)++;
 
     return (ulChar);
 }
 
-#if 0
-
-/*
- *@@ encCodepageToUTF8:
- *
- *@@added V0.9.18 (2002-03-08) [umoeller]
- */
-
-void encCodepageToUTF8(const char **ppch)
-{
-
-}
-
-putwchar(c)
-{
-  if (c < 0x80) {
-    putchar (c);
-  }
-  else if (c < 0x800) {
-    putchar (0xC0 | c>>6);
-    putchar (0x80 | c & 0x3F);
-  }
-  else if (c < 0x10000) {
-    putchar (0xE0 | c>>12);
-    putchar (0x80 | c>>6 & 0x3F);
-    putchar (0x80 | c & 0x3F);
-  }
-  else if (c < 0x200000) {
-    putchar (0xF0 | c>>18);
-    putchar (0x80 | c>>12 & 0x3F);
-    putchar (0x80 | c>>6 & 0x3F);
-    putchar (0x80 | c & 0x3F);
-  }
-}
-
-#endif
-
+