Changeset 7733

Timestamp:

2004-07-09T17:20:43+12:00 (20 years ago)

Author:

jrm21

Message:

fixes for compiler warnings

File:

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

trunk/gsdl/lib/cfgread.cpp

@@ -137 +137 @@
     bool inquote=false;
     char quotemark='"';
-    char preceding; // 1-char state to allow \" and \'
+    char preceding='\0'; // 1-char state to allow \" and \'
     // see if this is a quoted phrase
     if (c1=='\'' || c1=='\"') { // starts with a quote
@@ -176 +176 @@
     unsigned char c2;
     // two byte character
-    if (!filein.eof()) filein.get((char)c2); // get takes a signed char
+    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((char)c2);
-    if (!filein.eof()) filein.get((char)c3);
+    filein.get((char&)c2);
+    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)
+      } else {c=uc1;} // we don't do group2/plane0 (4,5,6-byte utf-8)
 
       curvalue.push_back(c); // 16bit unicode