0024863: CLang warnings -Wint-to-void-pointer-cast

Warning was fixed.

Remarks were applied.

- class VMap in Draw was removed
- NCollection_DataMap is used to store objects
- name of object is used to associate Tcl variable with the object
- creation and changing of objects are correclty handled

Redundant casts were removed.

Initial value is restored if variable is protected.
Tests for bug #24863 were added.

Some test cases and tcl command "save" were improved.

Useless using of upvar was removed.

diff --git a/src/Draw/Draw.cdl b/src/Draw/Draw.cdl
index b4acd3761f3658f5f7475f0222c916ea3c45ca47..bd2a1480ac83e12fb2f7100fca63cdcd606830b9 100644 (file)
--- a/src/Draw/Draw.cdl
+++ b/src/Draw/Draw.cdl
@@ -111,11 +111,6 @@ is
 
     class Printer;
 
-    class VMap instantiates
-      DataMap from TCollection(Integer,
-                              Drawable3D from Draw,
-                               MapIntegerHasher from TColStd);    
-        
     class MapOfAsciiString instantiates IndexedMap from TCollection(AsciiString from TCollection,AsciiString from TCollection); 
      
     Load(theDI: out Interpretor from Draw;

diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx
index 2ab2e82725ec4c35ee19c40012aed7bac51b4813..e94de8fea99f5e77ad780128f7b130387aeb363e 100644 (file)
--- a/src/Draw/Draw_VariableCommands.cxx
+++ b/src/Draw/Draw_VariableCommands.cxx
@@ -30,9 +30,10 @@
 #include <Draw_Grid.hxx>
 #include <Draw_Drawable3D.hxx>
 #include <Draw_SequenceOfDrawable3D.hxx>
-#include <Draw_VMap.hxx>
 #include <Draw_ProgressIndicator.hxx>
 
+#include <NCollection_DataMap.hxx>
+
 #include <ios>
 
 #ifdef WNT
@@ -60,7 +61,7 @@ extern Draw_Interpretor theCommands;
 // The Integer Value is the content of the TCl variable 
 //===============================================
 
-static Draw_VMap theVariables;
+static NCollection_DataMap<TCollection_AsciiString,Handle(Draw_Drawable3D)> theVariables;
 
 //=======================================================================
 //function : FindVariable
@@ -310,8 +311,9 @@ static Standard_Integer erase(Draw_Interpretor& di, Standard_Integer n, const ch
     
     // sauvegarde des proteges visibles
     Draw_SequenceOfDrawable3D prot;
-    for (i = 1; i <= theVariables.Extent(); i++) {
-      const Handle(Draw_Drawable3D)& D = *((Handle(Draw_Drawable3D)*)&theVariables(i));
+    NCollection_DataMap<TCollection_AsciiString,Handle(Draw_Drawable3D)>::Iterator aMapIt (theVariables);
+    for (; aMapIt.More(); aMapIt.Next()) {
+      const Handle(Draw_Drawable3D)& D = aMapIt.Value();
       if (!D.IsNull()) {
        if (D->Protected() && D->Visible())
          prot.Append(D);
@@ -723,27 +725,21 @@ void Draw::Set(const Standard_CString name,
 }
 
 // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-static char* tracevar(ClientData CD, Tcl_Interp*,const char*,const char*, Standard_Integer)
-#else
-static char* tracevar(ClientData CD, Tcl_Interp*, char*, char*, Standard_Integer)
-#endif
+static char* tracevar(ClientData, Tcl_Interp*,const char* name,const char*, Standard_Integer)
 {
   // protect if the map was destroyed before the interpretor
   if (theVariables.IsEmpty()) return NULL;
-
   // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-  Handle(Draw_Drawable3D)& D = *((Handle(Draw_Drawable3D)*)&theVariables((long)CD));
-#else
-  Standard_Integer index = (Standard_Integer) CD;
-  Handle(Draw_Drawable3D)& D = *((Handle(Draw_Drawable3D)*)&theVariables(index));
-#endif
-  if (D.IsNull())
+  Handle(Draw_Drawable3D)& D = theVariables(name);
+  if (D.IsNull()) {
+    theVariables.UnBind(name);
     return NULL;
-  if (D->Protected())
+  }
+  if (D->Protected()) {
+    D->Name(Tcl_SetVar(theCommands.Interp(),name,name,0));
     return (char*) "variable is protected";
-  else {
+  } else {
+    Tcl_UntraceVar(theCommands.Interp(),name,TCL_TRACE_UNSETS | TCL_TRACE_WRITES,tracevar,NULL);
     if (D->Visible()) {
       dout.RemoveDrawable(D);
       if (D->Is3D()) 
@@ -752,6 +748,7 @@ static char* tracevar(ClientData CD, Tcl_Interp*, char*, char*, Standard_Integer
        repaint2d = Standard_True;
     }
     D.Nullify();
+    theVariables.UnBind(name);
     return NULL;
   }
 }
@@ -771,28 +768,27 @@ void Draw::Set(const Standard_CString name,
     }
   }
   else {
-    
-    Tcl_UnsetVar(theCommands.Interp(),name,0);
+    if (theVariables.IsBound(name)) {
+      if (theVariables(name)->Protected()) {
+        cout << "variable is protected" << endl;
+        return;
+      }
+    }
     if (!D.IsNull()) {
-      Standard_Integer ival = theVariables.Extent() + 1;
-      theVariables.Bind(ival,D);
+      Tcl_UnsetVar(theCommands.Interp(),name,0);
+      theVariables.Bind(name,D);
       // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
       D->Name(Tcl_SetVar(theCommands.Interp(),name,name,0));
-#else
-      D->Name(Tcl_SetVar(theCommands.Interp(),(char*)name,(char*)name,0));
-#endif
-    
       // set the trace function
-      Tcl_TraceVar(theCommands.Interp(),name,TCL_TRACE_UNSETS,
-                  tracevar,(ClientData)ival);
-      
+      Tcl_TraceVar(theCommands.Interp(),name,TCL_TRACE_UNSETS | TCL_TRACE_WRITES,tracevar,NULL);
       if (displ) {
        if (!D->Visible())
          dout << D;
       }
       else if (D->Visible())
        dout.RemoveDrawable(D);
+    } else {
+      Tcl_UnsetVar(theCommands.Interp(),name,0);
     }
   }
 }
@@ -823,11 +819,6 @@ void Draw::Set(const Standard_CString Name, const Standard_Real val)
 Handle(Draw_Drawable3D) Draw::Get(Standard_CString& name, 
                                  const Standard_Boolean )
 {
-#if !((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) || defined(USE_NON_CONST)
-  Standard_PCharacter pName;
-  pName=(Standard_PCharacter)name;
-#endif
-  //
   Standard_Boolean pick = ((name[0] == '.') && (name[1] == '\0'));
   Handle(Draw_Drawable3D) D;
   if (pick) {
@@ -843,21 +834,7 @@ Handle(Draw_Drawable3D) Draw::Get(Standard_CString& name,
   }
   else {
     // MKV 29.03.05
-#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
-    Standard_Address index =  
-      Tcl_VarTraceInfo(theCommands.Interp(),name,TCL_TRACE_UNSETS,
-                      tracevar, NULL);
-    if (index != 0) 
-      D = Handle(Draw_Drawable3D)::DownCast(theVariables((long)index));
-#else
-    Standard_Integer index = (Standard_Integer) 
-      Tcl_VarTraceInfo(theCommands.Interp(),
-                      pName,
-                      TCL_TRACE_UNSETS,
-                      tracevar, NULL);
-    if (index != 0)
-      D = Handle(Draw_Drawable3D)::DownCast(theVariables(index));
-#endif
+    theVariables.Find(name,D);
 #if 0
     if (D.IsNull() && complain)
       cout <<name<<" does not exist"<<endl;

diff --git a/src/DrawResources/StandardCommands.tcl b/src/DrawResources/StandardCommands.tcl
index 7751c3e15a960a345e3d5fc860c16bd38f6e8baa..12ff6576f46138da2bcf2e395b34ea57ba5219c2 100644 (file)
--- a/src/DrawResources/StandardCommands.tcl
+++ b/src/DrawResources/StandardCommands.tcl
@@ -267,10 +267,9 @@ help datadir {datadir [directory]} "DRAW Variables management"
 
 proc save {name {file ""}} {
     if {$file == ""} {set file $name}
-    upvar $name n
-    if {![isdraw n]} {error "save : $name is not a Draw variable"}
+    if {![isdraw $name]} {error "save : $name is not a Draw variable"}
     global Draw_DataDir
-    bsave n [file join $Draw_DataDir $file]
+    bsave $name [file join $Draw_DataDir $file]
     return [file join $Draw_DataDir $file]
 }
 

diff --git a/tests/bugs/fclasses/bug24863_1 b/tests/bugs/fclasses/bug24863_1
new file mode 100644 (file)
index 0000000..7d1a81b
--- /dev/null
+++ b/tests/bugs/fclasses/bug24863_1
@@ -0,0 +1,14 @@
+# Test for #24863: memory leak
+
+set listmem {}
+
+for {set i 1} {$i < 100000} {incr i} {
+    box b 10 10 10
+
+    lappend listmem [meminfo h]
+
+    if { [checktrend $listmem 0 256 "Memory leak detected"] } {
+        puts "No memory leak, $i iterations"
+        break
+    }
+}
\ No newline at end of file

diff --git a/tests/bugs/fclasses/bug24863_2 b/tests/bugs/fclasses/bug24863_2
new file mode 100644 (file)
index 0000000..fd17843
--- /dev/null
+++ b/tests/bugs/fclasses/bug24863_2
@@ -0,0 +1,18 @@
+# Test for #24863: creation of variables
+
+box b 10 10 10
+set is_ok [whatis b]
+
+set b aaaa
+
+box b 10 10 10
+
+set check_ok [whatis b]
+if {$is_ok != $check_ok} {
+    puts "Error : results of command \"whatis\" are different"
+}
+
+set check_puts [puts $b]
+if {$check_puts != ""} {
+    puts "Error : result of command \"puts\" is wrong"
+}
\ No newline at end of file

diff --git a/tests/bugs/fclasses/bug24863_3 b/tests/bugs/fclasses/bug24863_3
new file mode 100644 (file)
index 0000000..890338f
--- /dev/null
+++ b/tests/bugs/fclasses/bug24863_3
@@ -0,0 +1,19 @@
+# Test for #24863: protect variable
+
+box b 10 10 10
+set is_ok [whatis b]
+protect b
+
+if {![catch {set b aaaaa}]} {
+     puts "Error : variable was changed"
+}
+
+set check_puts [puts $b]
+if {$check_puts != ""} {
+    puts "Error : result of command \"puts\" is wrong"
+}
+
+set check_ok [whatis b]
+if {$is_ok != $check_ok} {
+    puts "Error : results of command \"whatis\" are different"
+}
\ No newline at end of file

diff --git a/tests/bugs/modalg_2/bug298 b/tests/bugs/modalg_2/bug298
index 75d0e848b3c29da712d5ecd9313d0cc34a4d9379..9cc5363a21aefcdb585871250c13faf843273fd2 100755 (executable)
--- a/tests/bugs/modalg_2/bug298
+++ b/tests/bugs/modalg_2/bug298
@@ -10,7 +10,7 @@ puts ""
 restore [locate_data_file OCC298.brep] result
 checkshape result
 
-if [catch {tcopy result a } result] {
+if [catch {tcopy result a } res] {
   puts "Faulty OCC298: function TCOPY works wrongly"
 } else {
   puts "OCC298 OK: function TCOPY works properly"

diff --git a/tests/bugs/modalg_2/bug410_4 b/tests/bugs/modalg_2/bug410_4
index 7e71d71212f70393ca5b3bffeac0843d42d0ada1..01c2b94315d267c390ebe410cdad92a198f87a30 100755 (executable)
--- a/tests/bugs/modalg_2/bug410_4
+++ b/tests/bugs/modalg_2/bug410_4
@@ -12,7 +12,7 @@ restore [locate_data_file f3] b2
 checkshape b2
 
 
-if [catch {bcut result b2 b1 } result] {
+if [catch {bcut result b2 b1 } res] {
     puts "Faulty OCC410: function CUT works wrongly"
 } else {
     puts " OCC410 OK: function CUT works properly"

diff --git a/tests/bugs/modalg_2/bug485 b/tests/bugs/modalg_2/bug485
index b33b0806cbbb70640cdd2b0e0337f911f6c1de76..7521c44be52d86a049377804e0ed1dab0ad9cc8b 100755 (executable)
--- a/tests/bugs/modalg_2/bug485
+++ b/tests/bugs/modalg_2/bug485
@@ -13,7 +13,7 @@ checkshape a_1
 restore [locate_data_file OCC485a.brep] a_2
 checkshape a_2
 
-if [catch {bfuse result a_1 a_2 } result] {
+if [catch {bfuse result a_1 a_2 } res] {
     puts "Faulty OCC485: Draw hangs up during performing fuse operation"
 } else {
     puts "OCC485 OK: function FUSE works without Draw hangs up "

diff --git a/tests/bugs/modalg_2/bug487 b/tests/bugs/modalg_2/bug487
index 0668076d0a1486a2800ff774e4e4442afb272852..581065e5a8ef9ad86e591c3f696c8446e1dfdeb9 100755 (executable)
--- a/tests/bugs/modalg_2/bug487
+++ b/tests/bugs/modalg_2/bug487
@@ -14,7 +14,7 @@ puts "========================"
 restore [locate_data_file CFI_pro15441.rle] m 
 explode m e
 
-if [catch {blend result  m 2 m_36 2 m_21 } result] {
+if [catch {blend result  m 2 m_36 2 m_21 } res] {
     puts "Faulty OCC485: function BLEND works wrongly"
 } else {
     puts "OCC485 OK: function BLEND works properly "

diff --git a/tests/bugs/modalg_2/bug5805_1 b/tests/bugs/modalg_2/bug5805_1
index ccde342639b95c924d22bd864175ced95ad37196..adcd00d63ddfe368989532e86afeab83d3fb5b7c 100755 (executable)
--- a/tests/bugs/modalg_2/bug5805_1
+++ b/tests/bugs/modalg_2/bug5805_1
@@ -37,7 +37,7 @@ if { [catch { set tolmaxres [tolmax result] } catch_result] } {
 }
 
 regexp {max tol = ([-0-9.+eE]+)} $tolmaxres full maxtolerance
-if { [catch { expr $maxtolerance } result] } {
+if { [catch { expr $maxtolerance } res] } {
    puts "Faulty ${BugNumber} : maxtolerance is wrong (1)."
 }
 if { $maxtolerance > 1. } {

diff --git a/tests/bugs/moddata_2/bug23165 b/tests/bugs/moddata_2/bug23165
index 831d7a319e758c30a834a15d9c69aed443eed2b0..5b05ca9aa1916a602d0d4c9be452428aaf4d8bb6 100755 (executable)
--- a/tests/bugs/moddata_2/bug23165
+++ b/tests/bugs/moddata_2/bug23165
@@ -96,15 +96,15 @@ restore [locate_data_file OCC23165-curve.rle] c
 mkedge result c 20 36
 
 donly result
-set result [bounding result]
+set res [bounding result]
 fit
 
-set x1 [lindex ${result} 0]
-set y1 [lindex ${result} 1]
-set z1 [lindex ${result} 2]
-set x2 [lindex ${result} 3]
-set y2 [lindex ${result} 4]
-set z2 [lindex ${result} 5]
+set x1 [lindex ${res} 0]
+set y1 [lindex ${res} 1]
+set z1 [lindex ${res} 2]
+set x2 [lindex ${res} 3]
+set y2 [lindex ${res} 4]
+set z2 [lindex ${res} 5]
 
 set good_x1 -17.6105835090592
 set good_y1 -4.7133570660117909

diff --git a/tests/bugs/moddata_2/bug332 b/tests/bugs/moddata_2/bug332
index 82893296a6db8f1a23d75aae4ce59cae1c955396..dbf2c8356b483dc18bb3974c736156c17a4ac384 100755 (executable)
--- a/tests/bugs/moddata_2/bug332
+++ b/tests/bugs/moddata_2/bug332
@@ -72,11 +72,11 @@ if { ${listLength} < 20 } {
 regexp {Mass +: +([-0-9.+eE]+)} $props_6 full CircleLength_6
 
 # Calculation
-set pi [expr 2. * asin(1.0)]
-set TheoryCircleLength_4 [expr ${pi} * ${dia1}]
-set TheoryCircleLength_3 [expr ${pi} * (${dia1} + 2 * ${wall_thickness}) ]
-set TheoryCircleLength_6 [expr ${pi} * ${dia2}]
-set TheoryCircleLength_5 [expr ${pi} * (${dia2} + 2 * ${wall_thickness}) ]
+set Pi [expr 2. * asin(1.0)]
+set TheoryCircleLength_4 [expr ${Pi} * ${dia1}]
+set TheoryCircleLength_3 [expr ${Pi} * (${dia1} + 2 * ${wall_thickness}) ]
+set TheoryCircleLength_6 [expr ${Pi} * ${dia2}]
+set TheoryCircleLength_5 [expr ${Pi} * (${dia2} + 2 * ${wall_thickness}) ]
 
 set delta_3 [expr abs(${CircleLength_3} - ${TheoryCircleLength_3}) / ${TheoryCircleLength_3} * 100]
 set delta_4 [expr abs(${CircleLength_4} - ${TheoryCircleLength_4}) / ${TheoryCircleLength_4} * 100]

diff --git a/tests/bugs/xde/bug945 b/tests/bugs/xde/bug945
index ec12e25a4c7ff11703ed65dbc561633d9fc58e69..6ae44a57a0e36769dd4e58ff2ed73f2df3304b4a 100755 (executable)
--- a/tests/bugs/xde/bug945
+++ b/tests/bugs/xde/bug945
@@ -17,7 +17,7 @@ if { [regexp "Faulty" $che] == 1 } {
     puts "OCC945: Source shape is valid."
 }
 
-if [catch {fixshape result a 29.9 } result] {
+if [catch {fixshape result a 29.9 } res] {
     puts "Faulty OCC945: here is problem with FIXSHAPE function"
 } else {
     decho off

diff --git a/tests/caf/nam/A5 b/tests/caf/nam/A5
index b7586090812487523c0eb6c3becce4cf05453f13..1496c35bf39ff8eae180bb5afe8f6e8c56282aed 100644 (file)
--- a/tests/caf/nam/A5
+++ b/tests/caf/nam/A5
@@ -1,20 +1,19 @@
 #################### select shape and check selection procedure ####################
 proc Select {lab shape context} {
   global D IsDone TestError
-  upvar 1 $shape myshape $context mycontext
   set res ""
   if {[string compare $context ""] == 0} {
-    if {[catch {set res [SelectShape D $lab myshape]}]} {
+    if {[catch {set res [SelectShape D $lab $shape]}]} {
        set IsDone 0
-       set TestError "$TestError # SelectShape bad result for args: $lab myshape"
+       set TestError "$TestError # SelectShape bad result for args: $lab shape"
     }
   } else {
-    if {[catch {set res [SelectShape D $lab myshape mycontext]}]} {
+    if {[catch {set res [SelectShape D $lab $shape $context]}]} {
        set IsDone 0
-       set TestError "$TestError # SelectShape bad result for args: $lab myshape"
+       set TestError "$TestError # SelectShape bad result for args: $lab shape"
     }
   }
-  return [CenterOfShape myshape]
+  return [CenterOfShape $shape]
 }
 
 if {[catch {set TestLab}] == 1} {

diff --git a/tests/geometry/begin b/tests/geometry/begin
index b161e346c3a993d67d6797de4b88ff21f791c0c0..8bf5f4596e00abe45dacbeb3aa33fc3568be6b11 100755 (executable)
--- a/tests/geometry/begin
+++ b/tests/geometry/begin
@@ -21,12 +21,11 @@ if { [info exists test_image ] == 0 } {
 proc val2d { c u1 u2 n } {
 
   dset du ($u2-$u1)/$n
-  upvar $c cc
 
   set i 1
                        
   for {dset u $u1} { [dval u] <= $u2} {dset u ($u1+$i*[dval du])} {
-    2dcvalue cc u x y dx dy d2x d2y  ;
+    2dcvalue $c u x y dx dy d2x d2y  ;
     global p_$i d1_$i d2_$i 
     point p_$i  x y;
     puts "u   = [dval u]"
@@ -47,12 +46,11 @@ proc val2d { c u1 u2 n } {
 proc val3d { c u1 u2 n } {
 
   dset du ($u2-$u1)/$n
-  upvar $c cc
   
   set i 1
                
   for {dset u $u1} { [dval u] <= $u2} {dset u (u+[dval du])} {
-    cvalue cc u x y z dx dy dz d2x d2y d2z ; 
+    cvalue $c u x y z dx dy dz d2x d2y d2z ;
     point p_$i  x y z;
     puts "u   = [dval u]"
     puts "p_$i  [dval x  ] [dval y  ] [dval z]";
@@ -75,10 +73,8 @@ proc compare {r1 r2 tol} {
 } 
 
 proc comparepnt2d {p1 p2 tol} {
-       upvar $p1 pp1
-       upvar $p2 pp2
-       coord pp1 x1 y1
-       coord pp2 x2 y2
+       coord $p1 x1 y1
+       coord $p2 x2 y2
        compare [dval x1] [dval x2] $tol
        compare [dval y1] [dval y2] $tol
 }

diff --git a/tests/mesh/end b/tests/mesh/end
index 5640b83cee1086c257a39bd7ceeb1ce67bf39656..ecd803637a98886a8efefe17172596ed010cc2bb 100644 (file)
--- a/tests/mesh/end
+++ b/tests/mesh/end
@@ -138,8 +138,7 @@ puts " "
 
 # Check if area of triangles is valid
 proc CheckTriArea {shape {eps 0}} {
-  upvar #0 $shape a
-  set area [triarea a $eps]
+  set area [triarea $shape $eps]
   set t_area [lindex $area 0]
   set g_area [expr abs([lindex $area 1])]
   puts "area by triangles: $t_area"

diff --git a/tests/offset/faces_type_i/C9 b/tests/offset/faces_type_i/C9
index f1f655c5a0e35c30a8ef81cf0d915e1e7e0b18a3..5dfd985d3628e3dea3306b5116c138c775f58e86 100644 (file)
--- a/tests/offset/faces_type_i/C9
+++ b/tests/offset/faces_type_i/C9
@@ -2,6 +2,7 @@ puts "TODO ?OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO ?OCC23748 ALL: Tcl Exception: ERROR. offsetperform operation not done."
 puts "TODO ?OCC23748 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO ?OCC23748 ALL: Error : The volume of the resulting shape is"
+puts "TODO ?OCC23748 ALL: Error : The area of face result_. of the resulting shape is negative"
 puts "TODO ?OCC23748 ALL: TEST INCOMPLETE"
 puts "TODO ?DEBUG_OCC24121 : Error : The area of face"
 puts "TODO ?OCC24156 MacOS: Error : The area of face"

diff --git a/tests/xml/begin b/tests/xml/begin
index f5cc9f73cc988b02bb30409443ee2f38076258d8..8308f7e1911003bf247c0bc1543cbaeee5c3c9eb 100755 (executable)
--- a/tests/xml/begin
+++ b/tests/xml/begin
@@ -43,7 +43,7 @@ proc SaveToFile { aD aFile } {
     upvar $aD D 
     global FileSuffix ValidatorCheck
     catch {[file delete ${aFile}]}
-    SaveAs D $aFile
+    SaveAs $D $aFile
     if { [file exists $aFile] } {
        if { $FileSuffix == "xml" && $ValidatorCheck} {
            ValidateXml $aFile