Changeset 23729 for branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c

Timestamp:

Apr 7, 2009, 3:11:50 PM (17 years ago)

Author:

jhoblitt

Message:

partial merge from head

Location:

branches/neb_distrib_20081210/Nebulous/nebclient/src

Files:

• . (modified) (1 prop)
• soapC.c (modified) (12 diffs)

branches/neb_distrib_20081210/Nebulous/nebclient/src

@@ +1 @@
+Makefile.in
 .deps
+Makefile
+soapClientLib.c
+nebulous.h
+soapClient.c
+soapStub.h
+soapC.c
+soapH.h
+soapServerLib.c
+soapServer.c
 .libs
-Makefile
-Makefile.in
-SOAP.nsmap
-libnebclient.la
-nebclient.lo
-nebulous.h
-soapC.c
-soapC.lo
-soapClient.c
-soapClient.lo
-soapClientLib.c
-soapH.h
-soapServer.c
-soapServerLib.c
-soapStub.h
-stdsoap2.lo
-xmalloc.lo

@@ +1 @@
+Makefile.in
 .deps
+Makefile
+soapClientLib.c
+nebulous.h
+soapClient.c
+soapStub.h
+soapC.c
+soapH.h
+soapServerLib.c
+soapServer.c
 .libs
-Makefile
-Makefile.in
-SOAP.nsmap
-libnebclient.la
-nebclient.lo
-nebulous.h
-soapC.c
-soapC.lo
-soapClient.c
-soapClient.lo
-soapClientLib.c
-soapH.h
-soapServer.c
-soapServerLib.c
-soapStub.h
-stdsoap2.lo
-xmalloc.lo

branches/neb_distrib_20081210/Nebulous/nebclient/src/soapC.c

@@ -1 +1 @@
 /* soapC.c
-   Generated by gSOAP 2.7.11 from src/nebulous.h
+   Generated by gSOAP 2.7.12 from src/nebulous.h
    Copyright(C) 2000-2008, Robert van Engelen, Genivia Inc. All Rights Reserved.
    This part of the software is released under one of the following licenses:
@@ -12 +12 @@
 #endif
 
-SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-12-11 21:42:14 GMT")
+SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.12 2009-04-03 00:34:43 GMT")
 
 
@@ -676 +676 @@
 
 SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type)
-{
-        return soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+{       char *p;
+        p = soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+        return p;
 }
 
@@ -711 +712 @@
 
 SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap *soap, const char *tag, int *a, const char *type)
-{
-        return soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+{       int *p;
+        p = soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+        return p;
 }
 
@@ -1342 +1344 @@
 {
         (void)soap; (void)a; /* appease -Wall -Werror */
-        soap_default_string(soap, &a->key);
         soap_default_string(soap, &a->uri);
 }
@@ -1349 +1350 @@
 {
         (void)soap; (void)a; /* appease -Wall -Werror */
-        soap_serialize_string(soap, &a->key);
         soap_serialize_string(soap, &a->uri);
 }
@@ -1365 +1365 @@
         if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__delete_USCOREinstance), type))
                 return soap->error;
-        if (soap_out_string(soap, "key", -1, &a->key, ""))
-                return soap->error;
         if (soap_out_string(soap, "uri", -1, &a->uri, ""))
                 return soap->error;
@@ -1382 +1380 @@
 SOAP_FMAC3 struct ns1__delete_USCOREinstance * SOAP_FMAC4 soap_in_ns1__delete_USCOREinstance(struct soap *soap, const char *tag, struct ns1__delete_USCOREinstance *a, const char *type)
 {
-        size_t soap_flag_key = 1;
         size_t soap_flag_uri = 1;
         if (soap_element_begin_in(soap, tag, 0, type))
@@ -1394 +1391 @@
                 for (;;)
                 {       soap->error = SOAP_TAG_MISMATCH;
-                        if (soap_flag_key && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                                if (soap_in_string(soap, "key", &a->key, "xsd:string"))
-                                {       soap_flag_key--;
-                                        continue;
-                                }
                         if (soap_flag_uri && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
                                 if (soap_in_string(soap, "uri", &a->uri, "xsd:string"))
@@ -3394 +3386 @@
 {
         int i, n = a->__size;
-        char *t = soap_putsize(soap, "xsd:string", a->__size);
+        char *t = a->__ptr ? soap_putsize(soap, "xsd:string", a->__size) : NULL;
         id = soap_element_id(soap, tag, id, a, (struct soap_array*)&a->__ptr, 1, type, SOAP_TYPE_ArrayOfString);
         if (id < 0)
@@ -4036 +4028 @@
 
 SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type)
-{
-        return soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1);
+{       char **p;
+        p = soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1);
+        return p;
 }
 
@@ -4076 +4069 @@
 
 SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type)
-{
-        return soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+{       char **p;
+        p = soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+        return p;
 }
 

@@ +1 @@
+Makefile.in
 .deps
+Makefile
+soapClientLib.c
+nebulous.h
+soapClient.c
+soapStub.h
+soapC.c
+soapH.h
+soapServerLib.c
+soapServer.c
 .libs
-Makefile
-Makefile.in
-SOAP.nsmap
-libnebclient.la
-nebclient.lo
-nebulous.h
-soapC.c
-soapC.lo
-soapClient.c
-soapClient.lo
-soapClientLib.c
-soapH.h
-soapServer.c
-soapServerLib.c
-soapStub.h
-stdsoap2.lo
-xmalloc.lo