Changeset 4424 for trunk/packages/vizservers

Timestamp:

Jun 25, 2014 1:32:56 AM (10 years ago)

Author:

ldelgass

Message:

Use local string vars instead of temporaries

Location:

trunk/packages/vizservers

Files:

• geovis/RenderServer.cpp (modified) (2 diffs)
• geovis/RendererCmd.cpp (modified) (3 diffs)
• geovis/Stats.cpp (modified) (2 diffs)
• nanovis/Command.cpp (modified) (1 diff)

trunk/packages/vizservers/geovis/RenderServer.cpp

@@ -74 +74 @@
         << " {" << ((view.getSRS() == NULL) ? "" : view.getSRS()->getVertInitString()) << "}"
         << "\n";
-    len = oss.str().size();
-#ifdef USE_THREADS
-    queueResponse(oss.str().c_str(), len, Response::VOLATILE);
+    std::string ostr = oss.str();
+    len = ostr.size();
+#ifdef USE_THREADS
+    queueResponse(ostr.c_str(), len, Response::VOLATILE);
 #else 
-    ssize_t bytesWritten = SocketWrite(oss.str().c_str(), len);
+    ssize_t bytesWritten = SocketWrite(ostr.c_str(), len);
 
     if (bytesWritten < 0) {
@@ -169 +170 @@
 {
     std::ostringstream oss;
-    oss << "nv>ok -token " << g_stats.nCommands <<  "\n";
-    int nBytes = oss.str().length();
+    oss << "nv>ok -token " << g_stats.nCommands << "\n";
+    std::string ostr = oss.str();
+    int nBytes = ostr.length();
 
     TRACE("Sending OK for commands through %lu", g_stats.nCommands);
 #ifdef USE_THREADS
-    queueResponse(oss.str().c_str(), nBytes, Response::VOLATILE, Response::OK);
-#else
-    if (write(g_fdOut, oss.str().c_str(), nBytes) < 0) {
+    queueResponse(ostr.c_str(), nBytes, Response::VOLATILE, Response::OK);
+#else
+    if (write(g_fdOut, ostr.c_str(), nBytes) < 0) {
         ERROR("write failed: %s", strerror(errno));
         return -1;

trunk/packages/vizservers/geovis/RendererCmd.cpp

@@ -176 +176 @@
         << " {" << ((view.getSRS() == NULL) ? "" : view.getSRS()->getVertInitString()) << "}"
         << "\n";
-    len = oss.str().size();
+    std::string ostr = oss.str();
+    len = ostr.size();
 #ifdef USE_THREADS
-    queueResponse(oss.str().c_str(), len, Response::VOLATILE);
+    queueResponse(ostr.c_str(), len, Response::VOLATILE);
 #else 
-    ssize_t bytesWritten = SocketWrite(oss.str().c_str(), len);
+    ssize_t bytesWritten = SocketWrite(ostr.c_str(), len);
 
     if (bytesWritten < 0) {
@@ -1187 +1188 @@
         std::ostringstream path;
         path << "/tmp/tmp" << getpid() << ".earth";
-        FILE *tmpFile = fopen(path.str().c_str(), "w");
+        const char *pathStr = path.str().c_str();
+        FILE *tmpFile = fopen(pathStr, "w");
         fwrite(buf, len, 1, tmpFile);
         fclose(tmpFile);
-        g_renderer->loadEarthFile(path.str().c_str());
-        unlink(path.str().c_str());
+        g_renderer->loadEarthFile(pathStr);
+        unlink(pathStr);
         free(buf);
     } else {
@@ -1844 +1846 @@
             std::ostringstream oss;
             oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
-            nBytes = oss.str().length();
-
-            if (queueResponse(oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR) < 0) {
+            std::string ostr = oss.str();
+            nBytes = ostr.length();
+
+            if (queueResponse(ostr.c_str(), nBytes, Response::VOLATILE, Response::ERROR) < 0) {
                 return -1;
             }

trunk/packages/vizservers/geovis/Stats.cpp

@@ -101 +101 @@
 
     int fd = getStatsFile();
-    int result = writeToStatsFile(fd, oss.str().c_str(),
-                                  oss.str().length());
+    std::string ostr = oss.str();
+    int result = writeToStatsFile(fd, ostr.c_str(), ostr.length());
     close(fd);
     return result;
@@ -121 +121 @@
     keyStream << key << " "
               << getpid();
-
-    TRACE("Stats file key: '%s'", keyStream.str().c_str());
+    std::string keystr = keyStream.str();
+    TRACE("Stats file key: '%s'", keystr.c_str());
 
     md5_init(&state);
-    md5_append(&state, (const md5_byte_t *)keyStream.str().c_str(), keyStream.str().length());
+    md5_append(&state, (const md5_byte_t *)keystr.c_str(), keystr.length());
     md5_finish(&state, digest);
     for (int i = 0; i < 16; i++) {

trunk/packages/vizservers/nanovis/Command.cpp

@@ -2302 +2302 @@
             std::ostringstream oss;
             oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
-            nBytes = oss.str().length();
+            std::string ostr = oss.str();
+            nBytes = ostr.length();
 
 #ifdef USE_THREADS
-            queueResponse(oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+            queueResponse(ostr.c_str(), nBytes, Response::VOLATILE, Response::ERROR);
 #else
             if (write(fdOut, oss.str().c_str(), nBytes) < 0) {