Changeset 4778

Timestamp:

Nov 23, 2014 5:51:14 PM (9 years ago)

Author:

ldelgass

Message:

sync string fix with trunk

File:

• vtkvis/branches/1.7/RenderServer.cpp (modified) (2 diffs)

vtkvis/branches/1.7/RenderServer.cpp

@@ -220 +220 @@
 VtkVis::getStatsFile(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
-    Tcl_DString ds;
     Tcl_Obj **objv;
     int objc;
     int i;
     char fileName[33];
-    const char *path;
     md5_state_t state;
     md5_byte_t digest[16];
@@ -247 +245 @@
         sprintf(fileName + i * 2, "%02x", digest[i]);
     }
-    Tcl_DStringInit(&ds);
-    Tcl_DStringAppend(&ds, STATSDIR, -1);
-    Tcl_DStringAppend(&ds, "/", 1);
-    Tcl_DStringAppend(&ds, fileName, 32);
-    path = Tcl_DStringValue(&ds);
-
-    g_statsFile = open(path, O_EXCL | O_CREAT | O_WRONLY, 0600);
+    std::ostringstream oss;
+    oss << STATSDIR << "/" << fileName;
+    std::string pathStr = oss.str();
+
+    g_statsFile = open(pathStr.c_str(), O_EXCL | O_CREAT | O_WRONLY, 0600);
     Tcl_DStringFree(&ds);
     if (g_statsFile < 0) {
-        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
+        ERROR("can't open \"%s\": %s", pathStr.c_str(), strerror(errno));
         return -1;
     }