Changeset 12451 for issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp

Timestamp:

06/18/12 15:33:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor bug fix with xDelete

File:

• issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp

@@ -36 +36 @@
 
         if(numstrings){
-                value=(char**)xmalloc(numstrings*sizeof(char*));
+                value=xNew<char*>(numstrings);
                 for(i=0;i<numstrings;i++){
                         char* string=NULL;
                         size=strlen(in_values[i])+1;
-                        string=(char*)xmalloc(size*sizeof(char));
+                        string=xNew<char>(size);
                         memcpy(string,in_values[i],size*sizeof(char));
                         value[i]=string;
@@ -57 +57 @@
         for(i=0;i<this->numstrings;i++){
                 string=value[i];
-                xfree((void**)&string);
+                xDelete<char>(string);
         }
-        xfree((void**)&value);
+        xDelete<char*>(value);
 }
 /*}}}*/
@@ -120 +120 @@
         M=this->numstrings;
         if(this->numstrings){
-                outstrings=(char**)xmalloc(this->numstrings*sizeof(char*));
+                outstrings=xNew<char*>(this->numstrings);
 
                 for(i=0;i<this->numstrings;i++){
@@ -126 +126 @@
                         stringsize=strlen(string)+1;
 
-                        string2=(char*)xmalloc(stringsize*sizeof(char));
+                        string2=xNew<char>(stringsize);
                         memcpy(string2,string,stringsize*sizeof(char));
 
@@ -155 +155 @@
         for(i=0;i<this->numstrings;i++){
                 string=this->value[i];
-                xfree((void**)&string);
+                xDelete<char>(string);
         }
-        xfree((void**)&this->value);
+        xDelete<char*>(this->value);
 
         /*copy: */
         this->numstrings=M;
-        this->value=(char**)xmalloc(this->numstrings*sizeof(char*));
+        this->value=xNew<char*>(this->numstrings);
         for(i=0;i<this->numstrings;i++){
                 string=stringarray[i];
                 stringsize=strlen(string)+1;
 
-                string2=(char*)xmalloc(stringsize*sizeof(char));
+                string2=xNew<char>(stringsize);
                 memcpy(string2,string,stringsize*sizeof(char));