Changeset 7731

Timestamp:

2004-07-08T15:59:21+12:00 (20 years ago)

Author:

jrm21

Message:

gcc 3 is more strict about signed vs unsigned chars... and get() wants a
signed one. fixed.

File:

• trunk/gsdl/lib/cfgread.cpp (modified) (3 diffs)

trunk/gsdl/lib/cfgread.cpp

@@ -112 +112 @@
 
   text_t curvalue;
-  unsigned char c1;
+  char c1;
   filein.get(c1);
 
@@ -136 +136 @@
       
     bool inquote=false;
-    unsigned char quotemark='"';
-    unsigned char preceding; // 1-char state to allow \" and \'
+    char quotemark='"';
+    char preceding; // 1-char state to allow \" and \'
     // see if this is a quoted phrase
     if (c1=='\'' || c1=='\"') { // starts with a quote
@@ -169 +169 @@
       // see if current byte is part of a multibyte char (utf-8 only!)
       unsigned short int c; // text_t uses 16bit unicode
-      if (c1 < 0x80) {
-    c=c1;
-      } else if (c1 >= 0xc0 && c1 <= 0xdf) {
+      unsigned char uc1=(unsigned)c1;
+      if (uc1 < 0x80) {
+    c=uc1;
+      } else if (uc1 >= 0xc0 && uc1 <= 0xdf) {
     // 2-byte utf-8
     unsigned char c2;
     // two byte character
-    if (!filein.eof()) filein.get(c2);
-    c = ((c1 & 0x1f) << 6) + (c2 & 0x3f);
-      } else if (c1 >= 0xe0 && c1 <= 0xef) {
+    if (!filein.eof()) filein.get((char)c2); // get takes a signed char
+    c = ((uc1 & 0x1f) << 6) + (c2 & 0x3f);
+      } else if (uc1 >= 0xe0 && uc1 <= 0xef) {
     // 3-byte character
     unsigned char c2, c3;
-    if (!filein.eof()) filein.get(c2);
-    if (!filein.eof()) filein.get(c3);
-    c = ((c1 & 0xf) << 12) + ((c2 & 0x3f) << 6) + (c3 & 0x3f);
+    if (!filein.eof()) filein.get((char)c2);
+    if (!filein.eof()) filein.get((char)c3);
+    c = ((uc1 & 0xf) << 12) + ((c2 & 0x3f) << 6)
+      + (c3 & 0x3f);
       } // we don't do group2/plane0 (4,5,6-byte utf-8)