Index: trunk/Nebulous/nebclient/src/soapC.c =================================================================== --- trunk/Nebulous/nebclient/src/soapC.c (revision 19542) +++ trunk/Nebulous/nebclient/src/soapC.c (revision 20110) @@ -12,5 +12,5 @@ #endif -SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-09-13 01:14:40 GMT") +SOAP_SOURCE_STAMP("@(#) soapC.c ver 2.7.11 2008-10-13 22:06:55 GMT") @@ -189,8 +189,8 @@ case SOAP_TYPE_ns1__replicate_USCOREobjectResponse: return soap_in_ns1__replicate_USCOREobjectResponse(soap, NULL, NULL, "ns1:replicate_objectResponse"); - case SOAP_TYPE_ns1__rename_USCOREobject_: - return soap_in_ns1__rename_USCOREobject_(soap, NULL, NULL, "ns1:rename_object"); - case SOAP_TYPE_ns1__rename_USCOREobject_Response: - return soap_in_ns1__rename_USCOREobject_Response(soap, NULL, NULL, "ns1:rename_object-Response"); + case SOAP_TYPE_ns1__swap_USCOREobjects: + return soap_in_ns1__swap_USCOREobjects(soap, NULL, NULL, "ns1:swap_objects"); + case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: + return soap_in_ns1__swap_USCOREobjectsResponse(soap, NULL, NULL, "ns1:swap_objectsResponse"); case SOAP_TYPE_ns1__rename_USCOREobject: return soap_in_ns1__rename_USCOREobject(soap, NULL, NULL, "ns1:rename_object"); @@ -288,11 +288,11 @@ return soap_in_ns1__replicate_USCOREobjectResponse(soap, NULL, NULL, NULL); } - if (!soap_match_tag(soap, t, "ns1:rename_object")) - { *type = SOAP_TYPE_ns1__rename_USCOREobject_; - return soap_in_ns1__rename_USCOREobject_(soap, NULL, NULL, NULL); - } - if (!soap_match_tag(soap, t, "ns1:rename_object-Response")) - { *type = SOAP_TYPE_ns1__rename_USCOREobject_Response; - return soap_in_ns1__rename_USCOREobject_Response(soap, NULL, NULL, NULL); + if (!soap_match_tag(soap, t, "ns1:swap_objects")) + { *type = SOAP_TYPE_ns1__swap_USCOREobjects; + return soap_in_ns1__swap_USCOREobjects(soap, NULL, NULL, NULL); + } + if (!soap_match_tag(soap, t, "ns1:swap_objectsResponse")) + { *type = SOAP_TYPE_ns1__swap_USCOREobjectsResponse; + return soap_in_ns1__swap_USCOREobjectsResponse(soap, NULL, NULL, NULL); } if (!soap_match_tag(soap, t, "ns1:rename_object")) @@ -418,8 +418,8 @@ case SOAP_TYPE_ns1__replicate_USCOREobjectResponse: return soap_out_ns1__replicate_USCOREobjectResponse(soap, tag, id, (const struct ns1__replicate_USCOREobjectResponse *)ptr, "ns1:replicate_objectResponse"); - case SOAP_TYPE_ns1__rename_USCOREobject_: - return soap_out_ns1__rename_USCOREobject_(soap, tag, id, (const struct ns1__rename_USCOREobject_ *)ptr, "ns1:rename_object"); - case SOAP_TYPE_ns1__rename_USCOREobject_Response: - return soap_out_ns1__rename_USCOREobject_Response(soap, tag, id, (const struct ns1__rename_USCOREobject_Response *)ptr, "ns1:rename_object-Response"); + case SOAP_TYPE_ns1__swap_USCOREobjects: + return soap_out_ns1__swap_USCOREobjects(soap, tag, id, (const struct ns1__swap_USCOREobjects *)ptr, "ns1:swap_objects"); + case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: + return soap_out_ns1__swap_USCOREobjectsResponse(soap, tag, id, (const struct ns1__swap_USCOREobjectsResponse *)ptr, "ns1:swap_objectsResponse"); case SOAP_TYPE_ns1__rename_USCOREobject: return soap_out_ns1__rename_USCOREobject(soap, tag, id, (const struct ns1__rename_USCOREobject *)ptr, "ns1:rename_object"); @@ -501,9 +501,9 @@ soap_serialize_ns1__replicate_USCOREobjectResponse(soap, (const struct ns1__replicate_USCOREobjectResponse *)ptr); break; - case SOAP_TYPE_ns1__rename_USCOREobject_: - soap_serialize_ns1__rename_USCOREobject_(soap, (const struct ns1__rename_USCOREobject_ *)ptr); + case SOAP_TYPE_ns1__swap_USCOREobjects: + soap_serialize_ns1__swap_USCOREobjects(soap, (const struct ns1__swap_USCOREobjects *)ptr); break; - case SOAP_TYPE_ns1__rename_USCOREobject_Response: - soap_serialize_ns1__rename_USCOREobject_Response(soap, (const struct ns1__rename_USCOREobject_Response *)ptr); + case SOAP_TYPE_ns1__swap_USCOREobjectsResponse: + soap_serialize_ns1__swap_USCOREobjectsResponse(soap, (const struct ns1__swap_USCOREobjectsResponse *)ptr); break; case SOAP_TYPE_ns1__rename_USCOREobject: @@ -2160,67 +2160,67 @@ } -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__rename_USCOREobject_(struct soap *soap, struct ns1__rename_USCOREobject_ *a) -{ - (void)soap; (void)a; /* appease -Wall -Werror */ - soap_default_string(soap, &a->key); - soap_default_string(soap, &a->newkey); -} - -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__rename_USCOREobject_(struct soap *soap, const struct ns1__rename_USCOREobject_ *a) -{ - (void)soap; (void)a; /* appease -Wall -Werror */ - soap_serialize_string(soap, &a->key); - soap_serialize_string(soap, &a->newkey); -} - -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__rename_USCOREobject_(struct soap *soap, const struct ns1__rename_USCOREobject_ *a, const char *tag, const char *type) -{ - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__rename_USCOREobject_); - if (soap_out_ns1__rename_USCOREobject_(soap, tag, id, a, type)) - return soap->error; - return soap_putindependent(soap); -} - -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__rename_USCOREobject_(struct soap *soap, const char *tag, int id, const struct ns1__rename_USCOREobject_ *a, const char *type) -{ - if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobject_), type)) - return soap->error; - if (soap_out_string(soap, "key", -1, &a->key, "")) - return soap->error; - if (soap_out_string(soap, "newkey", -1, &a->newkey, "")) +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjects(struct soap *soap, struct ns1__swap_USCOREobjects *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + soap_default_string(soap, &a->key1); + soap_default_string(soap, &a->key2); +} + +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjects(struct soap *soap, const struct ns1__swap_USCOREobjects *a) +{ + (void)soap; (void)a; /* appease -Wall -Werror */ + soap_serialize_string(soap, &a->key1); + soap_serialize_string(soap, &a->key2); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjects(struct soap *soap, const struct ns1__swap_USCOREobjects *a, const char *tag, const char *type) +{ + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__swap_USCOREobjects); + if (soap_out_ns1__swap_USCOREobjects(soap, tag, id, a, type)) + return soap->error; + return soap_putindependent(soap); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjects(struct soap *soap, const char *tag, int id, const struct ns1__swap_USCOREobjects *a, const char *type) +{ + if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__swap_USCOREobjects), type)) + return soap->error; + if (soap_out_string(soap, "key1", -1, &a->key1, "")) + return soap->error; + if (soap_out_string(soap, "key2", -1, &a->key2, "")) return soap->error; return soap_element_end_out(soap, tag); } -SOAP_FMAC3 struct ns1__rename_USCOREobject_ * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_(struct soap *soap, struct ns1__rename_USCOREobject_ *p, const char *tag, const char *type) -{ - if ((p = soap_in_ns1__rename_USCOREobject_(soap, tag, p, type))) - if (soap_getindependent(soap)) - return NULL; - return p; -} - -SOAP_FMAC3 struct ns1__rename_USCOREobject_ * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject_ *a, const char *type) -{ - size_t soap_flag_key = 1; - size_t soap_flag_newkey = 1; +SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjects(struct soap *soap, struct ns1__swap_USCOREobjects *p, const char *tag, const char *type) +{ + if ((p = soap_in_ns1__swap_USCOREobjects(soap, tag, p, type))) + if (soap_getindependent(soap)) + return NULL; + return p; +} + +SOAP_FMAC3 struct ns1__swap_USCOREobjects * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjects(struct soap *soap, const char *tag, struct ns1__swap_USCOREobjects *a, const char *type) +{ + size_t soap_flag_key1 = 1; + size_t soap_flag_key2 = 1; if (soap_element_begin_in(soap, tag, 0, type)) return NULL; - a = (struct ns1__rename_USCOREobject_ *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__rename_USCOREobject_, sizeof(struct ns1__rename_USCOREobject_), 0, NULL, NULL, NULL); - if (!a) - return NULL; - soap_default_ns1__rename_USCOREobject_(soap, a); + a = (struct ns1__swap_USCOREobjects *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__swap_USCOREobjects, sizeof(struct ns1__swap_USCOREobjects), 0, NULL, NULL, NULL); + if (!a) + return NULL; + soap_default_ns1__swap_USCOREobjects(soap, a); if (soap->body && !*soap->href) { 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_newkey && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "newkey", &a->newkey, "xsd:string")) - { soap_flag_newkey--; + if (soap_flag_key1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_string(soap, "key1", &a->key1, "xsd:string")) + { soap_flag_key1--; + continue; + } + if (soap_flag_key2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_string(soap, "key2", &a->key2, "xsd:string")) + { soap_flag_key2--; continue; } @@ -2236,12 +2236,12 @@ } else - { a = (struct ns1__rename_USCOREobject_ *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__rename_USCOREobject_, 0, sizeof(struct ns1__rename_USCOREobject_), 0, NULL); - if (soap->body && soap_element_end_in(soap, tag)) - return NULL; - } - return a; -} - -SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__rename_USCOREobject_Response(struct soap *soap, struct ns1__rename_USCOREobject_Response *a) + { a = (struct ns1__swap_USCOREobjects *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__swap_USCOREobjects, 0, sizeof(struct ns1__swap_USCOREobjects), 0, NULL); + if (soap->body && soap_element_end_in(soap, tag)) + return NULL; + } + return a; +} + +SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__swap_USCOREobjectsResponse(struct soap *soap, struct ns1__swap_USCOREobjectsResponse *a) { (void)soap; (void)a; /* appease -Wall -Werror */ @@ -2249,5 +2249,5 @@ } -SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__rename_USCOREobject_Response(struct soap *soap, const struct ns1__rename_USCOREobject_Response *a) +SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__swap_USCOREobjectsResponse(struct soap *soap, const struct ns1__swap_USCOREobjectsResponse *a) { (void)soap; (void)a; /* appease -Wall -Werror */ @@ -2255,15 +2255,15 @@ } -SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__rename_USCOREobject_Response(struct soap *soap, const struct ns1__rename_USCOREobject_Response *a, const char *tag, const char *type) -{ - register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__rename_USCOREobject_Response); - if (soap_out_ns1__rename_USCOREobject_Response(soap, tag, id, a, type)) - return soap->error; - return soap_putindependent(soap); -} - -SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__rename_USCOREobject_Response(struct soap *soap, const char *tag, int id, const struct ns1__rename_USCOREobject_Response *a, const char *type) -{ - if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobject_Response), type)) +SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__swap_USCOREobjectsResponse(struct soap *soap, const struct ns1__swap_USCOREobjectsResponse *a, const char *tag, const char *type) +{ + register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__swap_USCOREobjectsResponse); + if (soap_out_ns1__swap_USCOREobjectsResponse(soap, tag, id, a, type)) + return soap->error; + return soap_putindependent(soap); +} + +SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__swap_USCOREobjectsResponse(struct soap *soap, const char *tag, int id, const struct ns1__swap_USCOREobjectsResponse *a, const char *type) +{ + if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__swap_USCOREobjectsResponse), type)) return soap->error; if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) @@ -2272,21 +2272,21 @@ } -SOAP_FMAC3 struct ns1__rename_USCOREobject_Response * SOAP_FMAC4 soap_get_ns1__rename_USCOREobject_Response(struct soap *soap, struct ns1__rename_USCOREobject_Response *p, const char *tag, const char *type) -{ - if ((p = soap_in_ns1__rename_USCOREobject_Response(soap, tag, p, type))) - if (soap_getindependent(soap)) - return NULL; - return p; -} - -SOAP_FMAC3 struct ns1__rename_USCOREobject_Response * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject_Response(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject_Response *a, const char *type) +SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_get_ns1__swap_USCOREobjectsResponse(struct soap *soap, struct ns1__swap_USCOREobjectsResponse *p, const char *tag, const char *type) +{ + if ((p = soap_in_ns1__swap_USCOREobjectsResponse(soap, tag, p, type))) + if (soap_getindependent(soap)) + return NULL; + return p; +} + +SOAP_FMAC3 struct ns1__swap_USCOREobjectsResponse * SOAP_FMAC4 soap_in_ns1__swap_USCOREobjectsResponse(struct soap *soap, const char *tag, struct ns1__swap_USCOREobjectsResponse *a, const char *type) { size_t soap_flag_result = 1; if (soap_element_begin_in(soap, tag, 0, type)) return NULL; - a = (struct ns1__rename_USCOREobject_Response *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__rename_USCOREobject_Response, sizeof(struct ns1__rename_USCOREobject_Response), 0, NULL, NULL, NULL); - if (!a) - return NULL; - soap_default_ns1__rename_USCOREobject_Response(soap, a); + a = (struct ns1__swap_USCOREobjectsResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__swap_USCOREobjectsResponse, sizeof(struct ns1__swap_USCOREobjectsResponse), 0, NULL, NULL, NULL); + if (!a) + return NULL; + soap_default_ns1__swap_USCOREobjectsResponse(soap, a); if (soap->body && !*soap->href) { @@ -2309,5 +2309,5 @@ } else - { a = (struct ns1__rename_USCOREobject_Response *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__rename_USCOREobject_Response, 0, sizeof(struct ns1__rename_USCOREobject_Response), 0, NULL); + { a = (struct ns1__swap_USCOREobjectsResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__swap_USCOREobjectsResponse, 0, sizeof(struct ns1__swap_USCOREobjectsResponse), 0, NULL); if (soap->body && soap_element_end_in(soap, tag)) return NULL; @@ -2319,6 +2319,6 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ - soap_default_string(soap, &a->key); - soap_default_string(soap, &a->newkey); + soap_default_string(soap, &a->key1); + soap_default_string(soap, &a->key2); } @@ -2326,6 +2326,6 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ - soap_serialize_string(soap, &a->key); - soap_serialize_string(soap, &a->newkey); + soap_serialize_string(soap, &a->key1); + soap_serialize_string(soap, &a->key2); } @@ -2342,7 +2342,7 @@ if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobject), type)) return soap->error; - if (soap_out_string(soap, "key", -1, &a->key, "")) - return soap->error; - if (soap_out_string(soap, "newkey", -1, &a->newkey, "")) + if (soap_out_string(soap, "key1", -1, &a->key1, "")) + return soap->error; + if (soap_out_string(soap, "key2", -1, &a->key2, "")) return soap->error; return soap_element_end_out(soap, tag); @@ -2359,6 +2359,6 @@ SOAP_FMAC3 struct ns1__rename_USCOREobject * SOAP_FMAC4 soap_in_ns1__rename_USCOREobject(struct soap *soap, const char *tag, struct ns1__rename_USCOREobject *a, const char *type) { - size_t soap_flag_key = 1; - size_t soap_flag_newkey = 1; + size_t soap_flag_key1 = 1; + size_t soap_flag_key2 = 1; if (soap_element_begin_in(soap, tag, 0, type)) return NULL; @@ -2371,12 +2371,12 @@ 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_newkey && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) - if (soap_in_string(soap, "newkey", &a->newkey, "xsd:string")) - { soap_flag_newkey--; + if (soap_flag_key1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_string(soap, "key1", &a->key1, "xsd:string")) + { soap_flag_key1--; + continue; + } + if (soap_flag_key2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG)) + if (soap_in_string(soap, "key2", &a->key2, "xsd:string")) + { soap_flag_key2--; continue; } @@ -2408,5 +2408,5 @@ { (void)soap; (void)a; /* appease -Wall -Werror */ - soap_serialize_PointerTostring(soap, &a->result); + soap_serialize_PointerToint(soap, &a->result); } @@ -2423,5 +2423,5 @@ if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__rename_USCOREobjectResponse), type)) return soap->error; - if (soap_out_PointerTostring(soap, "result", -1, &a->result, "")) + if (soap_out_PointerToint(soap, "result", -1, &a->result, "")) return soap->error; return soap_element_end_out(soap, tag); @@ -2450,5 +2450,5 @@ { soap->error = SOAP_TAG_MISMATCH; if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH) - if (soap_in_PointerTostring(soap, "result", &a->result, "xsd:string")) + if (soap_in_PointerToint(soap, "result", &a->result, "xsd:int")) { soap_flag_result--; continue;