You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by su...@apache.org on 2004/01/09 14:32:00 UTC
cvs commit: ws-axis/c/src/soap SoapDeSerializer.cpp SoapSerializer.cpp
susantha 2004/01/09 05:32:00
Modified: c/src/client/samples/interoptests/base Tag: CWrapperSupport
InteropBaseClient.cpp
c/src/client/samples/interoptests/doclitbase Tag:
CWrapperSupport InteropBaseClient.cpp
SOAPStruct.cpp
c/src/client/samples/interoptests/groupB Tag:
CWrapperSupport InteropGroupBClient.cpp
InteropTestPortTypeB.cpp SOAPArrayStruct.cpp
SOAPStruct.cpp SOAPStructStruct.cpp
c/src/common Tag: CWrapperSupport ArrayBean.cpp
BasicTypeSerializer.cpp MessageData.cpp
c/src/server/samples/interoptests/base Tag: CWrapperSupport
SOAPStruct.cpp
c/src/server/samples/interoptests/groupB Tag:
CWrapperSupport SOAPArrayStruct.cpp SOAPStruct.cpp
SOAPStructStruct.cpp
c/src/soap Tag: CWrapperSupport SoapDeSerializer.cpp
SoapSerializer.cpp
Log:
InteropgroupB sample in doc/lit style.
Corrected compilation issues with gcc
Revision Changes Path
No revision
No revision
1.5.2.3 +1 -1 ws-axis/c/src/client/samples/interoptests/base/InteropBaseClient.cpp
Index: InteropBaseClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/base/InteropBaseClient.cpp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- InteropBaseClient.cpp 5 Jan 2004 04:03:50 -0000 1.5.2.2
+++ InteropBaseClient.cpp 9 Jan 2004 13:31:59 -0000 1.5.2.3
@@ -73,7 +73,7 @@
SOAPStruct stct;
stct.varFloat = 12345.7346345;
stct.varInt = 5000;
- stct.varString = "This is string in SOAPStruct";
+ stct.varString = strdup("This is string in SOAPStruct");
printf("invoking echoStruct...\n");
if (ws.echoStruct(&stct) != NULL)
printf("successful\n");
No revision
No revision
1.1.2.3 +1 -1 ws-axis/c/src/client/samples/interoptests/doclitbase/Attic/InteropBaseClient.cpp
Index: InteropBaseClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/doclitbase/Attic/InteropBaseClient.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- InteropBaseClient.cpp 8 Jan 2004 09:01:20 -0000 1.1.2.2
+++ InteropBaseClient.cpp 9 Jan 2004 13:31:59 -0000 1.1.2.3
@@ -88,7 +88,7 @@
arrstct.m_Array[x].varFloat = 1.1111*x;
arrstct.m_Array[x].varInt = x;
sprintf(buffer1, "varString of %dth element of SOAPStruct array", x);
- arrstct.m_Array[x].varString = buffer1;
+ arrstct.m_Array[x].varString = strdup(buffer1);
}
//testing echo Struct Array
printf("invoking echoStructArray...\n");
1.1.2.3 +1 -1 ws-axis/c/src/client/samples/interoptests/doclitbase/Attic/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/doclitbase/Attic/SOAPStruct.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SOAPStruct.cpp 7 Jan 2004 11:21:15 -0000 1.1.2.2
+++ SOAPStruct.cpp 9 Jan 2004 13:31:59 -0000 1.1.2.3
@@ -52,7 +52,7 @@
SOAPStruct::~SOAPStruct()
{
- delete varString;
+ free(varString);
}
SOAPStruct::SOAPStruct()
No revision
No revision
1.4.2.2 +9 -10 ws-axis/c/src/client/samples/interoptests/groupB/InteropGroupBClient.cpp
Index: InteropGroupBClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/InteropGroupBClient.cpp,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- InteropGroupBClient.cpp 5 Jan 2004 04:03:50 -0000 1.4.2.1
+++ InteropGroupBClient.cpp 9 Jan 2004 13:31:59 -0000 1.4.2.2
@@ -6,7 +6,6 @@
int main(int argc, char* argv[])
{
-/*
int x;
InteropTestPortTypeB ws;
//we do not support multi-dimensional arrays.
@@ -16,12 +15,12 @@
SOAPArrayStruct sas;
sas.varFloat = 12345.67890;
sas.varInt = 5000;
- sas.varString = "varString content of SOAPArrayStruct";
+ sas.varString = strdup("varString content of SOAPArrayStruct");
sas.varArray.m_Array = new AxisChar*[ARRAYSIZE];
sas.varArray.m_Size = ARRAYSIZE;
for (x=0; x<ARRAYSIZE; x++)
{
- sas.varArray.m_Array[x] = "content of string array element";
+ sas.varArray.m_Array[x] = strdup("content of string array element");
}
printf("invoking echoNestedArray...\n");
if (ws.echoNestedArray(&sas) != NULL)
@@ -33,11 +32,11 @@
SOAPStructStruct sss;
sss.varFloat = 12345.67890;
sss.varInt = 5000;
- sss.varString = "varString content of SOAPStructStruct";
+ sss.varString = strdup("varString content of SOAPStructStruct");
sss.varStruct = new SOAPStruct();
sss.varStruct->varFloat = 67890.12345;
sss.varStruct->varInt = 54321;
- sss.varStruct->varString = "varString content of SOAPStruct";
+ sss.varStruct->varString = strdup("varString content of SOAPStruct");
printf("invoking echoNestedStruct...\n");
if (ws.echoNestedStruct(&sss) != NULL)
printf("successful\n");
@@ -45,7 +44,7 @@
printf("failed\n");
//testing echo Simple types as struct
- string str = "content of string passed";
+ char* str = strdup("content of string passed");
printf("invoking echoSimpleTypesAsStruct...\n");
if (ws.echoSimpleTypesAsStruct(12345.67890, 5000, str) != NULL)
printf("successful\n");
@@ -56,16 +55,16 @@
SOAPStruct ss;
ss.varFloat = 12345.67890;
ss.varInt = 5000;
- ss.varString = "content of string passed";
- string outStr;
+ ss.varString = strdup("content of string passed");
+ char* outStr;
int outInt;
float outFloat;
printf("invoking echoStructAsSimpleTypes...\n");
ws.echoStructAsSimpleTypes(&ss, &outStr, &outInt, &outFloat);
- if (outInt == 5000 && outStr == "content of string passed" && outFloat > 12345.67)
+ if (outInt == 5000 && (0 == strcmp(outStr,"content of string passed")) && outFloat > 12345.67)
printf("successful\n");
else
printf("failed\n");
getchar();
-*/ return 0;
+ return 0;
}
1.8.4.3 +6 -3 ws-axis/c/src/client/samples/interoptests/groupB/InteropTestPortTypeB.cpp
Index: InteropTestPortTypeB.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/InteropTestPortTypeB.cpp,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -u -r1.8.4.2 -r1.8.4.3
--- InteropTestPortTypeB.cpp 5 Jan 2004 04:03:50 -0000 1.8.4.2
+++ InteropTestPortTypeB.cpp 9 Jan 2004 13:31:59 -0000 1.8.4.3
@@ -55,9 +55,12 @@
nStatus = m_pCall->Invoke();
if (AXIS_SUCCESS == nStatus)
{
- *outValue0 = m_pCall->GetElementAsString(0,0);
- *outValue1 = m_pCall->GetElementAsInt(0,0);
- *outValue2 = m_pCall->GetElementAsFloat(0,0);
+ if (AXIS_SUCCESS == m_pCall->CheckMessage("echoStructAsSimpleTypesResponse", "http://soapinterop.org/"))
+ {
+ *outValue0 = m_pCall->GetElementAsString(0,0);
+ *outValue1 = m_pCall->GetElementAsInt(0,0);
+ *outValue2 = m_pCall->GetElementAsFloat(0,0);
+ }
}
m_pCall->UnInitialize();
}
1.2.4.3 +1 -1 ws-axis/c/src/client/samples/interoptests/groupB/SOAPArrayStruct.cpp
Index: SOAPArrayStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPArrayStruct.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- SOAPArrayStruct.cpp 5 Jan 2004 04:03:50 -0000 1.2.4.2
+++ SOAPArrayStruct.cpp 9 Jan 2004 13:31:59 -0000 1.2.4.3
@@ -53,7 +53,7 @@
SOAPArrayStruct::~SOAPArrayStruct()
{
- delete varString;
+ free(varString);
delete varArray.m_Array;
}
/////////////////////////////////////////////////////////////////////////////
1.2.4.3 +1 -1 ws-axis/c/src/client/samples/interoptests/groupB/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPStruct.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- SOAPStruct.cpp 5 Jan 2004 04:03:50 -0000 1.2.4.2
+++ SOAPStruct.cpp 9 Jan 2004 13:31:59 -0000 1.2.4.3
@@ -51,7 +51,7 @@
SOAPStruct::~SOAPStruct()
{
- delete varString;
+ free(varString);
}
/////////////////////////////////////////////////////////////////////////////
// This static method delete a SOAPStruct type of object
1.3.4.3 +1 -1 ws-axis/c/src/client/samples/interoptests/groupB/SOAPStructStruct.cpp
Index: SOAPStructStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/client/samples/interoptests/groupB/SOAPStructStruct.cpp,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- SOAPStructStruct.cpp 5 Jan 2004 04:03:50 -0000 1.3.4.2
+++ SOAPStructStruct.cpp 9 Jan 2004 13:31:59 -0000 1.3.4.3
@@ -61,7 +61,7 @@
SOAPStructStruct::~SOAPStructStruct()
{
- delete varString;
+ free(varString);
delete varStruct;
}
/////////////////////////////////////////////////////////////////////////////
No revision
No revision
1.13.4.6 +1 -1 ws-axis/c/src/common/ArrayBean.cpp
Index: ArrayBean.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.cpp,v
retrieving revision 1.13.4.5
retrieving revision 1.13.4.6
diff -u -r1.13.4.5 -r1.13.4.6
--- ArrayBean.cpp 5 Jan 2004 04:03:50 -0000 1.13.4.5
+++ ArrayBean.cpp 9 Jan 2004 13:31:59 -0000 1.13.4.6
@@ -95,7 +95,7 @@
delete m_value.cta;
}
}
- else if (AxisEngine::m_bServer)
+ else if (AxisEngine::m_bServer && m_value.sta)
{
switch (m_type)
{
1.16.4.3 +1 -1 ws-axis/c/src/common/BasicTypeSerializer.cpp
Index: BasicTypeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/BasicTypeSerializer.cpp,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -u -r1.16.4.2 -r1.16.4.3
--- BasicTypeSerializer.cpp 5 Jan 2004 04:03:50 -0000 1.16.4.2
+++ BasicTypeSerializer.cpp 9 Jan 2004 13:31:59 -0000 1.16.4.3
@@ -101,7 +101,7 @@
m_sSZ += m_Buf;
break;
case XSD_BOOLEAN:
- AxisSprintf(m_Buf, BTS_BUFFSIZE, "%s", (*((int*)(pValue)) == 0)?"false":"true");
+ AxisSprintf(m_Buf, BTS_BUFFSIZE, "%s", (*((int*)(pValue)) == false_)?"false":"true");
m_sSZ += m_Buf;
break;
case XSD_UNSIGNEDINT:
1.13.4.3 +1 -1 ws-axis/c/src/common/MessageData.cpp
Index: MessageData.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/MessageData.cpp,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -u -r1.13.4.2 -r1.13.4.3
--- MessageData.cpp 1 Jan 2004 04:48:52 -0000 1.13.4.2
+++ MessageData.cpp 9 Jan 2004 13:31:59 -0000 1.13.4.3
@@ -74,7 +74,7 @@
string MessageData::m_sBlankPropertyValue="";
extern WSDDDeployment* g_pWSDDDeployment;
-IMessageDataFunctions MessageData::ms_VFtable;
+IMessageDataFunctions IMessageData::ms_VFtable;
MessageData::MessageData()
{
No revision
No revision
1.2.4.4 +1 -1 ws-axis/c/src/server/samples/interoptests/base/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/base/SOAPStruct.cpp,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- SOAPStruct.cpp 5 Jan 2004 04:03:50 -0000 1.2.4.3
+++ SOAPStruct.cpp 9 Jan 2004 13:31:59 -0000 1.2.4.4
@@ -51,7 +51,7 @@
SOAPStruct::~SOAPStruct()
{
- delete varString;
+ free(varString);
}
/////////////////////////////////////////////////////////////////////////////
// This static method delete a SOAPStruct type of object
No revision
No revision
1.2.4.4 +1 -1 ws-axis/c/src/server/samples/interoptests/groupB/SOAPArrayStruct.cpp
Index: SOAPArrayStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPArrayStruct.cpp,v
retrieving revision 1.2.4.3
retrieving revision 1.2.4.4
diff -u -r1.2.4.3 -r1.2.4.4
--- SOAPArrayStruct.cpp 5 Jan 2004 04:03:50 -0000 1.2.4.3
+++ SOAPArrayStruct.cpp 9 Jan 2004 13:32:00 -0000 1.2.4.4
@@ -53,7 +53,7 @@
SOAPArrayStruct::~SOAPArrayStruct()
{
- delete varString;
+ free(varString);
delete varArray.m_Array;
}
/////////////////////////////////////////////////////////////////////////////
1.2.4.3 +1 -1 ws-axis/c/src/server/samples/interoptests/groupB/SOAPStruct.cpp
Index: SOAPStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPStruct.cpp,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- SOAPStruct.cpp 5 Jan 2004 04:03:50 -0000 1.2.4.2
+++ SOAPStruct.cpp 9 Jan 2004 13:32:00 -0000 1.2.4.3
@@ -51,7 +51,7 @@
SOAPStruct::~SOAPStruct()
{
- delete varString;
+ free(varString);
}
/////////////////////////////////////////////////////////////////////////////
// This static method delete a SOAPStruct type of object
1.3.4.3 +1 -1 ws-axis/c/src/server/samples/interoptests/groupB/SOAPStructStruct.cpp
Index: SOAPStructStruct.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/samples/interoptests/groupB/SOAPStructStruct.cpp,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- SOAPStructStruct.cpp 5 Jan 2004 04:03:50 -0000 1.3.4.2
+++ SOAPStructStruct.cpp 9 Jan 2004 13:32:00 -0000 1.3.4.3
@@ -61,7 +61,7 @@
SOAPStructStruct::~SOAPStructStruct()
{
- delete varString;
+ free(varString);
delete varStruct;
}
/////////////////////////////////////////////////////////////////////////////
No revision
No revision
1.17.4.15 +3 -1 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.17.4.14
retrieving revision 1.17.4.15
diff -u -r1.17.4.14 -r1.17.4.15
--- SoapDeSerializer.cpp 7 Jan 2004 11:21:15 -0000 1.17.4.14
+++ SoapDeSerializer.cpp 9 Jan 2004 13:32:00 -0000 1.17.4.15
@@ -82,7 +82,7 @@
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-IWrapperSoapDeSerializerFunctions SoapDeSerializer::ms_VFtable;
+IWrapperSoapDeSerializerFunctions IWrapperSoapDeSerializer::ms_VFtable;
SoapDeSerializer::SoapDeSerializer()
{
@@ -544,6 +544,7 @@
DESERIALIZE_ENCODED_ARRAY_BLOCK(struct tm, CONV_STRTODATETIME)
case XSD_DURATION:
DESERIALIZE_ENCODED_ARRAY_BLOCK(long, CONV_STRTODURATION)
+ default:;
}
}
}
@@ -634,6 +635,7 @@
DESERIALIZE_LITERAL_ARRAY_BLOCK(struct tm, CONV_STRTODATETIME)
case XSD_DURATION:
DESERIALIZE_LITERAL_ARRAY_BLOCK(long, CONV_STRTODURATION)
+ default:;
}
}
m_nStatus = AXIS_FAIL;
1.30.4.12 +1 -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.30.4.11
retrieving revision 1.30.4.12
diff -u -r1.30.4.11 -r1.30.4.12
--- SoapSerializer.cpp 7 Jan 2004 11:21:15 -0000 1.30.4.11
+++ SoapSerializer.cpp 9 Jan 2004 13:32:00 -0000 1.30.4.12
@@ -92,7 +92,7 @@
#define INITIAL_SERIALIZE_BUFFER_SIZE 4096
#define NO_OF_SERIALIZE_BUFFERS 10
-IWrapperSoapSerializerFunctions SoapSerializer::ms_VFtable;
+IWrapperSoapSerializerFunctions IWrapperSoapSerializer::ms_VFtable;
SoapSerializer::SoapSerializer()
{