Changeset 12915 for issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp

Timestamp:

08/06/12 15:34:22 (13 years ago)

Author:

jschierm

Message:

Implementation of xNew and xDelete in KML classes.

File:

• issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp

@@ -32 +32 @@
 KML_Attribute::~KML_Attribute(){
 
-        if (name      ) xfree((void**)&name);
-        if (value     ) xfree((void**)&value);
+        if (name      ) xDelete<char>(name);
+        if (value     ) xDelete<char>(value);
 
 }
@@ -100 +100 @@
 void  KML_Attribute::Alloc(const char* namei,const char* valuei){
 
-        name =(char *) xmalloc((strlen(namei )+1)*sizeof(char));
+        name =xNew<char>(strlen(namei )+1);
         memcpy(name,namei,(strlen(namei)+1)*sizeof(char));
 
-        value=(char *) xmalloc((strlen(valuei)+1)*sizeof(char));
+        value=xNew<char>(strlen(valuei)+1);
         memcpy(value,valuei,(strlen(valuei)+1)*sizeof(char));
 
@@ -121 +121 @@
 
         if (!value || !strlen(value)) {
-                *pvalueo=(char *) xmalloc((strlen(deflt)+1)*sizeof(char));
+                *pvalueo=xNew<char>(strlen(deflt)+1);
                 memcpy(*pvalueo,deflt,(strlen(deflt)+1)*sizeof(char));
         }
         else {
-                *pvalueo=(char *) xmalloc((strlen(value)+1)*sizeof(char));
+                *pvalueo=xNew<char>(strlen(value)+1);
                 memcpy(*pvalueo,value,(strlen(value)+1)*sizeof(char));
         }