Check state is defined before unset in unsetState

cea-hpc · Jul 30, 2022 · a2c3b76 · a2c3b76
1 parent b9af6a6
commit a2c3b76
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/tcl/envmngt.tcl.in b/tcl/envmngt.tcl.in
@@ -674,9 +674,7 @@ proc renderSettings {} {
       }
 
       setState shell [getState modtosh_real_shell]
-      if {[isStateDefined shelltype]} {
-         unsetState shelltype
-      }
+      unsetState shelltype
    }
 
    # return text value if defined even if error happened

diff --git a/tcl/init.tcl.in b/tcl/init.tcl.in
@@ -170,8 +170,10 @@ proc getState {state {valifundef {}} {catchinitproc 0}} {
 
 # Clear state
 proc unsetState {state} {
-   unset ::g_states($state)
-   reportDebug "$state unset"
+   if {[isStateDefined $state]} {
+      unset ::g_states($state)
+      reportDebug "$state unset"
+   }
 }
 
 # Set state value

diff --git a/tcl/report.tcl.in b/tcl/report.tcl.in
@@ -736,9 +736,7 @@ proc reportFlush {} {
          report "[join $dispmsglist ,] \]"
       }
       # inhibit next content separator if output is ending
-      if {[isStateDefined report_sep_next]} {
-         unsetState report_sep_next
-      }
+      unsetState report_sep_next
       report \}
    }
 
@@ -978,12 +976,8 @@ proc popMsgRecordId {{setmsgid 1}} {
 }
 
 proc clearAllMsgRecordId {} {
-   if {[isStateDefined evalid]} {
-      unsetState evalid
-   }
-   if {[isStateDefined msgrecordid]} {
-      unsetState msgrecordid
-   }
+   unsetState evalid
+   unsetState msgrecordid
 }
 
 #

diff --git a/tcl/subcmd.tcl.in b/tcl/subcmd.tcl.in
@@ -2641,9 +2641,7 @@ proc cmdModuleModToSh {shell args} {
       reportErrorAndExit "Unsupported shell type \'$shell\'"
    }
    setState shell $shell
-   if {[isStateDefined shelltype]} {
-      unsetState shelltype
-   }
+   unsetState shelltype
 
    # silence message report (avoid mix with produced shell code) unless if
    # a debugging mode is set