You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2004/11/03 17:09:37 UTC
cvs commit: ws-axis/c/src/soap BasicNode.cpp CharacterElement.cpp ComplexElement.cpp
whitlock 2004/11/03 08:09:37
Modified: c/src/soap BasicNode.cpp CharacterElement.cpp
ComplexElement.cpp
Log:
Replace mallocs/frees/strdups with news/deletes
Revision Changes Path
1.10 +8 -5 ws-axis/c/src/soap/BasicNode.cpp
Index: BasicNode.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/BasicNode.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BasicNode.cpp 26 Oct 2004 10:40:55 -0000 1.9
+++ BasicNode.cpp 3 Nov 2004 16:09:37 -0000 1.10
@@ -43,27 +43,30 @@
BasicNode::BasicNode(const AxisChar* pachValue, NODE_TYPE eNodeType):m_iNodeType(eNodeType), m_pachValue(NULL)
{
- if(pachValue)
- this->m_pachValue = strdup(pachValue);
+ if(pachValue) {
+ m_pachValue = new char[strlen(pachValue)+1];
+ strcpy(m_pachValue,pachValue);
+ }
}
BasicNode::BasicNode(const BasicNode& rCopy):m_iNodeType(rCopy.m_iNodeType), m_pachValue(NULL)
{
if(this->m_pachValue)
- free(this->m_pachValue);
+ delete [] this->m_pachValue;
this->m_pachValue = NULL;
if( rCopy.m_pachValue)
{
- this->m_pachValue = strdup(rCopy.m_pachValue);
+ this->m_pachValue = new char[strlen(rCopy.m_pachValue)+1];
+ strcpy(this->m_pachValue,rCopy.m_pachValue);
}
}
BasicNode::~BasicNode()
{
if(m_pachValue)
- free(m_pachValue);
+ delete [] m_pachValue;
}
AXIS_CPP_NAMESPACE_END
1.20 +1 -1 ws-axis/c/src/soap/CharacterElement.cpp
Index: CharacterElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/CharacterElement.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CharacterElement.cpp 26 Oct 2004 10:40:55 -0000 1.19
+++ CharacterElement.cpp 3 Nov 2004 16:09:37 -0000 1.20
@@ -90,7 +90,7 @@
int CharacterElement::setValue(const AxisChar* pachValue)
{
- m_pachValue = (AxisChar*) malloc(strlen(pachValue)+1);
+ m_pachValue = new AxisChar[strlen(pachValue)+1];
strcpy(m_pachValue, pachValue);
return AXIS_SUCCESS;
1.29 +23 -17 ws-axis/c/src/soap/ComplexElement.cpp
Index: ComplexElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ComplexElement.cpp 2 Nov 2004 13:53:31 -0000 1.28
+++ ComplexElement.cpp 3 Nov 2004 16:09:37 -0000 1.29
@@ -61,11 +61,11 @@
ComplexElement::ComplexElement(AxisChar *pachLocalName, AxisChar *pachPrefix,
AxisChar *pachUri)
{
- m_pachLocalName = (AxisChar*) malloc(strlen(pachLocalName)+1);
+ m_pachLocalName = new AxisChar[strlen(pachLocalName)+1];
strcpy(m_pachLocalName, pachLocalName);
- m_pachPrefix = (AxisChar*) malloc(strlen(pachPrefix)+1);
+ m_pachPrefix = new AxisChar[strlen(pachPrefix)+1];
strcpy(m_pachPrefix, pachPrefix);
- m_pachURI = (AxisChar*) malloc(strlen(pachUri)+1);
+ m_pachURI = new AxisChar[strlen(pachUri)+1];
strcpy(m_pachURI, pachUri);
}
@@ -82,14 +82,20 @@
itCurrBasicNode++;
}
- if(rCopy.m_pachPrefix)
- this->m_pachPrefix = strdup(rCopy.m_pachPrefix);
+ if(rCopy.m_pachPrefix) {
+ this->m_pachPrefix = new char[strlen(rCopy.m_pachPrefix)+1];
+ strcpy(this->m_pachPrefix,rCopy.m_pachPrefix);
+ }
+
+ if(rCopy.m_pachLocalName) {
+ this->m_pachLocalName = new char[strlen(rCopy.m_pachLocalName)+1];
+ strcpy(this->m_pachLocalName,rCopy.m_pachLocalName);
+ }
- if(rCopy.m_pachLocalName)
- this->m_pachLocalName = strdup(rCopy.m_pachLocalName);
-
- if(rCopy.m_pachURI)
- this->m_pachURI = strdup(rCopy.m_pachURI);
+ if(rCopy.m_pachURI) {
+ this->m_pachURI = new char[strlen(rCopy.m_pachURI)+1];
+ strcpy(this->m_pachURI,rCopy.m_pachURI);
+ }
}
BasicNode* ComplexElement::clone()
@@ -100,9 +106,9 @@
ComplexElement::~ComplexElement()
{
- free(m_pachPrefix);
- free(m_pachLocalName);
- free(m_pachURI);
+ delete [] m_pachPrefix;
+ delete [] m_pachLocalName;
+ delete [] m_pachURI;
/*
*Clear the Attributes
@@ -158,14 +164,14 @@
int ComplexElement::setPrefix(const AxisChar* pachPrefix)
{
- m_pachPrefix = (AxisChar*) malloc(strlen(pachPrefix)+1);
+ m_pachPrefix = new AxisChar[strlen(pachPrefix)+1];
strcpy(m_pachPrefix, pachPrefix);
return AXIS_SUCCESS;
}
int ComplexElement::setLocalName(const AxisChar* pachLocalName)
{
- m_pachLocalName = (AxisChar*) malloc(strlen(pachLocalName)+1);
+ m_pachLocalName = new AxisChar[strlen(pachLocalName)+1];
strcpy(m_pachLocalName, pachLocalName);
return AXIS_SUCCESS;
}
@@ -243,7 +249,7 @@
{
const AxisChar* pachTmp = pSZ.getNamespacePrefix(m_pachURI,
blnIsNewNamespace);
- m_pachPrefix = (AxisChar*) malloc(strlen(pachTmp)+1);
+ m_pachPrefix = new AxisChar[strlen(pachTmp)+1];
strcpy(m_pachPrefix , pachTmp);
if (blnIsNewNamespace)
@@ -349,7 +355,7 @@
int ComplexElement::setURI(const AxisChar* pachURI)
{
- m_pachURI = (AxisChar*) malloc(strlen(pachURI)+1);
+ m_pachURI = new AxisChar[strlen(pachURI)+1];
strcpy(m_pachURI, pachURI);
return AXIS_SUCCESS;
}