Changeset 310 for trunk/src

Timestamp:

Mar 10, 2006 7:39:19 AM (18 years ago)

Author:

cxsong

Message:

modified readString to null terminate string

File:

• trunk/src/mesh/reader.cc (modified) (3 diffs)

trunk/src/mesh/reader.cc

@@ -55 +55 @@
 
 // 
-// parse object name
+// parse dynamic length string
+// first 4 bytes: length of string = len
+// character array of length = len
 //
 void readString(const char* buf, string& str)
@@ -67 +69 @@
 
         ptr += sizeof(int);
+#ifdef DEBUG
+        printf("readString(const char*,string&): len=%d, ptr=%x\n",
+                        len, (unsigned)ptr);
+#endif
         
         // read chars
 
-        char* cstr = new char[len]; ;
+        char* cstr = new char[len+1]; ;
+        cstr[len] = '\0';
+
         ByteOrder<char>::OrderCopyArray(ptr, cstr, len);
-        filterTrailingBlanks(cstr, len);
-        str = cstr;
+
+#ifdef DEBUG
+        printf("readString: str=%s=, %d bytes\n", cstr, len);
+#endif
+
+        str.assign((const char*)cstr);
 
         delete [] cstr;
+}
+
+//
+// read chars of length(len) from buffer (buf)
+// return chars in string (null terminated)
+//
+void readString(const char* buf, string& str, int len)
+{
+        char* ch = new char[len];
+
+        ByteOrder<char>::OrderCopyArray(buf, ch, len);
+        filterTrailingBlanks(ch, len);
+
+        str = ch;
+
+        delete [] ch;
 }
 
@@ -192 +220 @@
         ByteOrder<int>::OrderCopyArray(&(data[0]), iptr, npts);
 }
+