ttsnoop: resolve coverity 176047, 176046, 176044, 176043, 176042 and 176040

diff --git a/cde/programs/ttsnoop/DtTt.C b/cde/programs/ttsnoop/DtTt.C
index 24d977071842b2bb1d7b8c50c65f2b2aa8999112..ffd208fa989215400fd894e9e8d781087fbfb24d 100644 (file)
--- a/cde/programs/ttsnoop/DtTt.C
+++ b/cde/programs/ttsnoop/DtTt.C
@@ -466,8 +466,7 @@ DtTtSetLabel(
     Tt_status status = tt_ptr_error( val );
     std::ostringstream errStream;
     errStream << func << " = " << val << " (" << status << ")" << ends;
-    const char *label = errStream.str().c_str();
-    DtTtSetLabel( labelWidget, label );
+    DtTtSetLabel( labelWidget, errStream.str().c_str() );
     return status;
 }
 
@@ -480,8 +479,7 @@ DtTtSetLabel(
 {
     std::ostringstream errStream;
     errStream << func << " = " << status << ends;
-    const char *label = errStream.str().c_str();
-    DtTtSetLabel( labelWidget, label );
+    DtTtSetLabel( labelWidget, errStream.str().c_str() );
     return status;
 }
 
@@ -494,8 +492,8 @@ DtTtSetLabel(
 {
     std::ostringstream errStream;
     errStream << func << " = " << returnVal << ends;
-    const char *label = errStream.str().c_str();
-    DtTtSetLabel( labelWidget, label );
+    DtTtSetLabel( labelWidget,
+                  const_cast<char *>(errStream.str().c_str()) );
     return returnVal;
 }
 
@@ -521,8 +519,8 @@ _DtTtChoices(
                        tt_free( name );
                }
                itemStream << ends;
-               char *string = const_cast<char *>(itemStream.str().c_str());
-               items[ i ] = XmStringCreateLocalized( string );
+               items[ i ] =
+                    XmStringCreateLocalized(const_cast<char *>(itemStream.str().c_str()));
        }
        return items;
 }
@@ -571,8 +569,8 @@ _DtTtChoices(
                                tt_free( id );
                        }
                        itemStream << ends;
-                       char *string = const_cast<char *>(itemStream.str().c_str());
-                       items[ i ] = XmStringCreateLocalized( string );
+                       items[ i ] =
+                            XmStringCreateLocalized(const_cast<char *>(itemStream.str().c_str()));
                }
                return items;
            case DTTT_PATTERN:

diff --git a/cde/programs/ttsnoop/ttsnoop.C.src b/cde/programs/ttsnoop/ttsnoop.C.src
index 5deb6fd8f81da7196c1c32d80a3a4388d2e399b7..e80312aab4c00851d781b4dba286747d1937f4c7 100644 (file)
--- a/cde/programs/ttsnoop/ttsnoop.C.src
+++ b/cde/programs/ttsnoop/ttsnoop.C.src
@@ -89,7 +89,7 @@ char *                snoopFile               = 0;
 Boolean                unlinkSnoopFile         = True;
 char *         traceFile               = 0;
 Boolean                unlinkTraceFile         = True;
-const char *   traceScript             = 0;
+std::string    traceScript;
 int            globalTimeout           = 20000;
 unsigned int   globalSaveLines         = 5000;
 const char *   globalVersionString     = "1.0";
@@ -667,7 +667,7 @@ main(int argc, char **argv)
     std::ostringstream envStr;
     envStr << "TT_TRACE_SCRIPT=> ";
     envStr << traceFile << ends;
-    traceScript = envStr.str().c_str();
+    traceScript = envStr.str();
     if (optImmediateTracing) {
            turnOnTracing( 0, 0, 0 );
     }

diff --git a/cde/programs/ttsnoop/ttsnoop_stubs.C.src b/cde/programs/ttsnoop/ttsnoop_stubs.C.src
index f57104a4e3dd0b8b07dd48ac8c1d3e8adeeabdcd..0ee8414ad5cc55ebd7c0e08890e016a4fd8c0e3f 100644 (file)
--- a/cde/programs/ttsnoop/ttsnoop_stubs.C.src
+++ b/cde/programs/ttsnoop/ttsnoop_stubs.C.src
@@ -47,7 +47,7 @@ extern "C" { const char *_tt_lib_version; };
 
 extern std::ofstream   snoopStream;
 extern unsigned int    globalSaveLines;
-extern char *          traceScript;
+extern std::string     traceScript;
 extern const char *    globalVersionString;
 extern Tt_pattern      snoopPat;
 extern Boolean         snoopPatIsRegistered;
@@ -118,7 +118,7 @@ turnOnTracing(
     DtTtSetLabel( instance->cancelButton, "Stop" );
     XtManageChild(instance->tracer_shellform);
     tt_trace_control( 0 );
-    putenv( traceScript );
+    putenv( const_cast<char *>(traceScript.c_str()) );
     tt_trace_control( 1 );
     /*** DTB_USER_CODE_END   ^^^ Add C code above ^^^ ***/
 }