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 sa...@apache.org on 2005/03/18 11:52:49 UTC
cvs commit: ws-axis/c/src/xml AnyElement.h
samisa 2005/03/18 02:52:49
Modified: c/src/cbindings AxisC.cpp AxisExceptionC.cpp
c/src/cbindings/client StubC.cpp
c/src/common AxisUtils.cpp
c/src/engine/client Call.cpp
c/src/engine/server ServerAxisEngine.cpp
c/src/soap SoapAttachementHeaders.cpp SoapDeSerializer.cpp
SoapKeywordMapping.cpp SoapSerializer.cpp
c/src/transport/axis2 SecureChannel.cpp
c/src/transport/axis3 HTTPTransport.cpp
c/src/xml AnyElement.h
Log:
Some warning elimination. Did this at this point simply because the warnings
get in the way of errors.
Revision Changes Path
1.4 +3 -1 ws-axis/c/src/cbindings/AxisC.cpp
Index: AxisC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/AxisC.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisC.cpp 19 Jan 2005 10:55:16 -0000 1.3
+++ AxisC.cpp 18 Mar 2005 10:52:19 -0000 1.4
@@ -29,4 +29,6 @@
STORAGE_CLASS_INFO void axiscTerminate() {
Axis::terminate();
}
-}
\ No newline at end of file
+}
+
+
1.3 +3 -1 ws-axis/c/src/cbindings/AxisExceptionC.cpp
Index: AxisExceptionC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/AxisExceptionC.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AxisExceptionC.cpp 19 Jan 2005 10:55:16 -0000 1.2
+++ AxisExceptionC.cpp 18 Mar 2005 10:52:19 -0000 1.3
@@ -35,4 +35,6 @@
AxisException *ae = (AxisException*)axisException;
return ae->getExceptionCode();
}
-}
\ No newline at end of file
+}
+
+
1.7 +4 -1 ws-axis/c/src/cbindings/client/StubC.cpp
Index: StubC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/client/StubC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StubC.cpp 4 Mar 2005 20:57:38 -0000 1.6
+++ StubC.cpp 18 Mar 2005 10:52:19 -0000 1.7
@@ -177,4 +177,7 @@
s->setSOAPHeadersStubC();
}
-}
\ No newline at end of file
+}
+
+
+
1.27 +4 -1 ws-axis/c/src/common/AxisUtils.cpp
Index: AxisUtils.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisUtils.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AxisUtils.cpp 18 Feb 2005 11:11:17 -0000 1.26
+++ AxisUtils.cpp 18 Mar 2005 10:52:19 -0000 1.27
@@ -165,4 +165,7 @@
return blnStatus;
}
-AXIS_CPP_NAMESPACE_END
\ No newline at end of file
+AXIS_CPP_NAMESPACE_END
+
+
+
1.104 +4 -2 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Call.cpp 9 Mar 2005 14:49:06 -0000 1.103
+++ Call.cpp 18 Mar 2005 10:52:19 -0000 1.104
@@ -828,11 +828,13 @@
IAttribute* pAttribute;
if (NULL!=pUri)
{
- pAttribute = new Attribute((std::list<Attribute*>)NULL, pLocalname, pPrefix, pUri, pValue);
+ std::list<Attribute*> attributeList;
+ pAttribute = new Attribute(attributeList, pLocalname, pPrefix, pUri, pValue);
}
else
{
- pAttribute = new Attribute((std::list<Attribute*>)NULL, pLocalname, pPrefix, pValue);
+ std::list<Attribute*> attributeList;
+ pAttribute = new Attribute(attributeList, pLocalname, pPrefix, pValue);
}
m_pIWSSZ->setSOAPMethodAttribute(((Attribute*)pAttribute)->clone());
}
1.29 +1 -1 ws-axis/c/src/engine/server/ServerAxisEngine.cpp
Index: ServerAxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/ServerAxisEngine.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ServerAxisEngine.cpp 16 Feb 2005 02:26:22 -0000 1.28
+++ ServerAxisEngine.cpp 18 Mar 2005 10:52:19 -0000 1.29
@@ -326,7 +326,7 @@
*/
//m_pSZ->setSoapFault (SoapFault::getSoapFault (CLIENT_SOAP_SOAPCONTENTERROR));
int iExceptionCode = e.getExceptionCode();
- char* pcTempStr = (char*) e.what();
+ //char* pcTempStr = (char*) e.what();
AXISTRACE2("Exception:", pcTempStr, CRITICAL);
if(AXISC_SERVICE_THROWN_EXCEPTION == iExceptionCode)
{
1.8 +3 -1 ws-axis/c/src/soap/SoapAttachementHeaders.cpp
Index: SoapAttachementHeaders.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachementHeaders.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SoapAttachementHeaders.cpp 22 Feb 2005 08:56:34 -0000 1.7
+++ SoapAttachementHeaders.cpp 18 Mar 2005 10:52:25 -0000 1.8
@@ -81,4 +81,6 @@
return "";
}
-AXIS_CPP_NAMESPACE_END
\ No newline at end of file
+AXIS_CPP_NAMESPACE_END
+
+
1.155 +6 -3 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- SoapDeSerializer.cpp 9 Mar 2005 14:49:06 -0000 1.154
+++ SoapDeSerializer.cpp 18 Mar 2005 10:52:25 -0000 1.155
@@ -126,7 +126,8 @@
{
SoapEnvelope *m_pEnvl = new SoapEnvelope ();
/* set all attributes of SoapEnvelope */
- pAttr = new Attribute ( (list<Attribute*>) NULL);
+ std::list<Attribute*> attributeList0;
+ pAttr = new Attribute ( attributeList0);
pAttr->setValue (m_pNode->m_pchNamespace);
m_pEnvl->addNamespaceDecl (pAttr);
@@ -151,7 +152,8 @@
/* Set Attributes */
for (int i = 0; m_pNode->m_pchAttributes[i]; i += 3)
{
- pAttr = new Attribute ((list<Attribute*>) NULL);
+ std::list<Attribute*> attributeList1;
+ pAttr = new Attribute (attributeList1);
pAttr->setLocalName (m_pNode->m_pchAttributes[i]);
pAttr->setURI (m_pNode->m_pchAttributes[i + 1]);
pAttr->setValue (m_pNode->m_pchAttributes[i + 2]);
@@ -257,7 +259,8 @@
while (true)
{
- Attribute *pAttribute = new Attribute ((list<Attribute*>) NULL);
+ std::list<Attribute*> attributeList2;
+ Attribute *pAttribute = new Attribute (attributeList2);
pAttribute->setLocalName (m_pNode->
m_pchAttributes
[iAttributeArrayIndex++]);
1.16 +7 -6 ws-axis/c/src/soap/SoapKeywordMapping.cpp
Index: SoapKeywordMapping.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapKeywordMapping.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SoapKeywordMapping.cpp 4 Mar 2005 17:03:11 -0000 1.15
+++ SoapKeywordMapping.cpp 18 Mar 2005 10:52:29 -0000 1.16
@@ -58,19 +58,20 @@
__TRC(gs_SoapEnvVersionsStruct[sv].pchWords[sw]);
}
}
+ std::list<Attribute*> attributeList;
/* soap 1.1 envelop attributes */
- m_Map[SOAP_VER_1_1].pEnv = new Attribute( (std::list<Attribute*>)NULL, "SOAP-ENV","xmlns","",
+ m_Map[SOAP_VER_1_1].pEnv = new Attribute( attributeList, "SOAP-ENV","xmlns","",
"http://schemas.xmlsoap.org/soap/envelope/");
- m_Map[SOAP_VER_1_1].pXsi = new Attribute( (std::list<Attribute*>)NULL, "xsi","xmlns","",
+ m_Map[SOAP_VER_1_1].pXsi = new Attribute( attributeList, "xsi","xmlns","",
"http://www.w3.org/2001/XMLSchema-instance");
- m_Map[SOAP_VER_1_1].pXsd = new Attribute( (std::list<Attribute*>)NULL, "xsd","xmlns","",
+ m_Map[SOAP_VER_1_1].pXsd = new Attribute( attributeList, "xsd","xmlns","",
"http://www.w3.org/2001/XMLSchema");
/* soap 1.2 envelop attributes */
- m_Map[SOAP_VER_1_2].pEnv = new Attribute( (std::list<Attribute*>)NULL, "env","xmlns","",
+ m_Map[SOAP_VER_1_2].pEnv = new Attribute( attributeList, "env","xmlns","",
"http://www.w3.org/2003/05/soap-envelope");
- m_Map[SOAP_VER_1_2].pXsi = new Attribute( (std::list<Attribute*>)NULL, "xsi","xmlns","",
+ m_Map[SOAP_VER_1_2].pXsi = new Attribute( attributeList, "xsi","xmlns","",
"http://www.w3.org/2001/XMLSchema-instance");
- m_Map[SOAP_VER_1_2].pXsd = new Attribute( (std::list<Attribute*>)NULL, "xsd","xmlns","",
+ m_Map[SOAP_VER_1_2].pXsd = new Attribute( attributeList, "xsd","xmlns","",
"http://www.w3.org/2001/XMLSchema");
m_bInit = true;
}
1.104 +6 -1 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- SoapSerializer.cpp 11 Mar 2005 09:58:59 -0000 1.103
+++ SoapSerializer.cpp 18 Mar 2005 10:52:29 -0000 1.104
@@ -415,6 +415,10 @@
/* send everything to transport layer, it should handle bufferization itself */
int nStatus = m_pOutputStream->sendBytes(cSerialized, 0);
// FIXME: should we process nStatus somehow?
+ if (AXIS_SUCCESS != nStatus)
+ {
+ //something gone wrong; what should we do?
+ }
}
catch(AxisSoapException& e)
{
@@ -1175,7 +1179,8 @@
void SoapSerializer::addNamespaceToEnvelope(AxisChar *pachNamespaceURI, AxisChar* pachPrefix)
{
- Attribute *pNameSpace = new Attribute((std::list<Attribute*>)NULL, pachPrefix, "xmlns", pachNamespaceURI);
+ std::list<Attribute*> attributeList;
+ Attribute *pNameSpace = new Attribute(attributeList, pachPrefix, "xmlns", pachNamespaceURI);
m_pSoapEnvelope->addNamespaceDecl(pNameSpace);
1.6 +1 -1 ws-axis/c/src/transport/axis2/SecureChannel.cpp
Index: SecureChannel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SecureChannel.cpp 6 Dec 2004 10:13:06 -0000 1.5
+++ SecureChannel.cpp 18 Mar 2005 10:52:49 -0000 1.6
@@ -39,7 +39,7 @@
void SecureChannel::setSecureProperties( const char * psSSLArgs)
{
- string * ps = (string *) psSSLArgs;
+ //string * ps = (string *) psSSLArgs;
}
const char * SecureChannel::getSecureProperties()
1.24 +1 -0 ws-axis/c/src/transport/axis3/HTTPTransport.cpp
Index: HTTPTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- HTTPTransport.cpp 16 Mar 2005 22:12:46 -0000 1.23
+++ HTTPTransport.cpp 18 Mar 2005 10:52:49 -0000 1.24
@@ -944,6 +944,7 @@
case CHANNEL_HTTP_SSL_DLL_NAME:
case CHANNEL_HTTP_DLL_NAME:
+ case CONTENT_TYPE:
{
break;
}
1.4 +4 -0 ws-axis/c/src/xml/AnyElement.h
Index: AnyElement.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/AnyElement.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AnyElement.h 17 Feb 2005 11:46:36 -0000 1.3
+++ AnyElement.h 18 Mar 2005 10:52:49 -0000 1.4
@@ -117,6 +117,10 @@
case START_ELEMENT:
//TODO.
break;
+ case START_PREFIX:
+ break;
+ case END_PREFIX:
+ break;
}
return sTmpVal;