Changeset 4422 for trunk/packages/vizservers/nanovis
- Timestamp:
- Jun 25, 2014 12:58:19 AM (10 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Command.cpp
r4368 r4422 2315 2315 } 2316 2316 2317 st ring = getUserMessages();2318 nBytes = strlen(string);2317 std::string msg = getUserMessages(); 2318 nBytes = msg.length(); 2319 2319 if (nBytes > 0) { 2320 string = msg.c_str(); 2320 2321 TRACE("userError=(%s)", string); 2321 2322 2322 2323 std::ostringstream oss; 2323 2324 oss << "nv>viserror -type error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string; 2324 nBytes = oss.str().length(); 2325 std::string ostr = oss.str(); 2326 nBytes = ostr.length(); 2325 2327 2326 2328 #ifdef USE_THREADS 2327 queueResponse(os s.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);2329 queueResponse(ostr.c_str(), nBytes, Response::VOLATILE, Response::ERROR); 2328 2330 #else 2329 if (write(fdOut, os s.str().c_str(), nBytes) < 0) {2331 if (write(fdOut, ostr.c_str(), nBytes) < 0) { 2330 2332 ERROR("write failed: %s", strerror(errno)); 2331 2333 return -1; -
trunk/packages/vizservers/nanovis/Trace.cpp
r3605 r4422 90 90 } 91 91 92 const char * 92 std::string 93 93 nv::getUserMessages() 94 94 { 95 return g_UserErrorString.str() .c_str();95 return g_UserErrorString.str(); 96 96 } 97 97 -
trunk/packages/vizservers/nanovis/Trace.h
r3613 r4422 8 8 #ifndef NV_TRACE_H 9 9 #define NV_TRACE_H 10 11 #include <string> 10 12 11 13 #include <GL/glew.h> … … 22 24 extern void logUserMessage(const char* format, ...); 23 25 24 extern const char *getUserMessages();26 extern std::string getUserMessages(); 25 27 26 28 extern void clearUserMessages();
Note: See TracChangeset
for help on using the changeset viewer.