Core/Dependency: Update gSoap to v2.8.0 - this should also fix some issues when connecting with Axis framework (needs to be tested)

+ Update packagelist to include correct versions of what we have in repository

--HG--
branch : trunk

1 files changed, 1178 insertions, 1183 deletions

diff --git a/dep/gsoap/soapC.cpp b/dep/gsoap/soapC.cpp
index 7b964aff6a9..1b6e24dcb4b 100644
--- a/dep/gsoap/soapC.cpp
+++ b/dep/gsoap/soapC.cpp
@@ -1,129 +1,136 @@
 /* soapC.cpp
-   Generated by gSOAP 2.7.10 from stub.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:
-   GPL, the gSOAP public license, or Genivia's license for commercial use.
+   Generated by gSOAP 2.8.0 from stub.h
+   Copyright(C) 2000-2010, Robert van Engelen, Genivia Inc. All Rights Reserved.
+   The generated code is released under one of the following licenses:
+   GPL OR Genivia's license for commercial use.
 */
 
+#if defined(__BORLANDC__)
+#pragma option push -w-8060
+#pragma option push -w-8004
+#endif
+
 #include "soapH.h"
 
-SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.7.10 2010-02-18 18:41:56 GMT")
+SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.0 2010-12-16 23:55:15 GMT")
 
 
 #ifndef WITH_NOGLOBAL
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serializeheader(struct soap *soap)
 {
-    if (soap->header)
-        soap_serialize_SOAP_ENV__Header(soap, soap->header);
+	if (soap->header)
+		soap_serialize_SOAP_ENV__Header(soap, soap->header);
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_putheader(struct soap *soap)
 {
-    if (soap->header)
-    {   soap->part = SOAP_IN_HEADER;
-        if (soap_out_SOAP_ENV__Header(soap, "SOAP-ENV:Header", 0, soap->header, NULL))
-            return soap->error;
-        soap->part = SOAP_END_HEADER;
-    }
-    return SOAP_OK;
+	if (soap->header)
+	{	soap->part = SOAP_IN_HEADER;
+		if (soap_out_SOAP_ENV__Header(soap, "SOAP-ENV:Header", 0, soap->header, NULL))
+			return soap->error;
+		soap->part = SOAP_END_HEADER;
+	}
+	return SOAP_OK;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_getheader(struct soap *soap)
 {
-    soap->part = SOAP_IN_HEADER;
-    soap->header = soap_in_SOAP_ENV__Header(soap, "SOAP-ENV:Header", NULL, NULL);
-    soap->part = SOAP_END_HEADER;
-    return soap->header == NULL;
+	soap->part = SOAP_IN_HEADER;
+	soap->header = soap_in_SOAP_ENV__Header(soap, "SOAP-ENV:Header", NULL, NULL);
+	soap->part = SOAP_END_HEADER;
+	return soap->header == NULL;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_header(struct soap *soap)
 {
-    if (!soap->header)
-    {   soap->header = soap_new_SOAP_ENV__Header(soap, -1);
-        soap_default_SOAP_ENV__Header(soap, soap->header);
-    }
+	if (!soap->header)
+	{	if ((soap->header = soap_new_SOAP_ENV__Header(soap, -1)))
+			soap_default_SOAP_ENV__Header(soap, soap->header);
+	}
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_fault(struct soap *soap)
 {
-    if (!soap->fault)
-    {   soap->fault = soap_new_SOAP_ENV__Fault(soap, -1);
-        soap_default_SOAP_ENV__Fault(soap, soap->fault);
-    }
-    if (soap->version == 2 && !soap->fault->SOAP_ENV__Code)
-    {   soap->fault->SOAP_ENV__Code = soap_new_SOAP_ENV__Code(soap, -1);
-        soap_default_SOAP_ENV__Code(soap, soap->fault->SOAP_ENV__Code);
-    }
-    if (soap->version == 2 && !soap->fault->SOAP_ENV__Reason)
-    {   soap->fault->SOAP_ENV__Reason = soap_new_SOAP_ENV__Reason(soap, -1);
-        soap_default_SOAP_ENV__Reason(soap, soap->fault->SOAP_ENV__Reason);
-    }
+	if (!soap->fault)
+	{	soap->fault = soap_new_SOAP_ENV__Fault(soap, -1);
+		if (!soap->fault)
+			return;
+		soap_default_SOAP_ENV__Fault(soap, soap->fault);
+	}
+	if (soap->version == 2 && !soap->fault->SOAP_ENV__Code)
+	{	soap->fault->SOAP_ENV__Code = soap_new_SOAP_ENV__Code(soap, -1);
+		soap_default_SOAP_ENV__Code(soap, soap->fault->SOAP_ENV__Code);
+	}
+	if (soap->version == 2 && !soap->fault->SOAP_ENV__Reason)
+	{	soap->fault->SOAP_ENV__Reason = soap_new_SOAP_ENV__Reason(soap, -1);
+		soap_default_SOAP_ENV__Reason(soap, soap->fault->SOAP_ENV__Reason);
+	}
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serializefault(struct soap *soap)
 {
-    soap_fault(soap);
-    if (soap->fault)
-        soap_serialize_SOAP_ENV__Fault(soap, soap->fault);
+	soap_fault(soap);
+	if (soap->fault)
+		soap_serialize_SOAP_ENV__Fault(soap, soap->fault);
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_putfault(struct soap *soap)
 {
-    if (soap->fault)
-        return soap_put_SOAP_ENV__Fault(soap, soap->fault, "SOAP-ENV:Fault", NULL);
-    return SOAP_OK;
+	if (soap->fault)
+		return soap_put_SOAP_ENV__Fault(soap, soap->fault, "SOAP-ENV:Fault", NULL);
+	return SOAP_OK;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_getfault(struct soap *soap)
 {
-    return (soap->fault = soap_get_SOAP_ENV__Fault(soap, NULL, "SOAP-ENV:Fault", NULL)) == NULL;
+	return (soap->fault = soap_get_SOAP_ENV__Fault(soap, NULL, "SOAP-ENV:Fault", NULL)) == NULL;
 }
 
 SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultcode(struct soap *soap)
 {
-    soap_fault(soap);
-    if (soap->version == 2)
-        return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Value;
-    return (const char**)&soap->fault->faultcode;
+	soap_fault(soap);
+	if (soap->version == 2)
+		return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Value;
+	return (const char**)&soap->fault->faultcode;
 }
 
 SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultsubcode(struct soap *soap)
 {
-    soap_fault(soap);
-    if (soap->version == 2)
-    {   if (!soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode)
-        {   soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode = soap_new_SOAP_ENV__Code(soap, -1);
-            soap_default_SOAP_ENV__Code(soap, soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode);
-        }
-        return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode->SOAP_ENV__Value;
-    }
-    return (const char**)&soap->fault->faultcode;
+	soap_fault(soap);
+	if (soap->version == 2)
+	{	if (!soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode)
+		{	soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode = soap_new_SOAP_ENV__Code(soap, -1);
+			soap_default_SOAP_ENV__Code(soap, soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode);
+		}
+		return (const char**)&soap->fault->SOAP_ENV__Code->SOAP_ENV__Subcode->SOAP_ENV__Value;
+	}
+	return (const char**)&soap->fault->faultcode;
 }
 
 SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultstring(struct soap *soap)
 {
-    soap_fault(soap);
-    if (soap->version == 2)
-        return (const char**)&soap->fault->SOAP_ENV__Reason->SOAP_ENV__Text;
-    return (const char**)&soap->fault->faultstring;
+	soap_fault(soap);
+	if (soap->version == 2)
+		return (const char**)&soap->fault->SOAP_ENV__Reason->SOAP_ENV__Text;
+	return (const char**)&soap->fault->faultstring;
 }
 
 SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultdetail(struct soap *soap)
 {
-    soap_fault(soap);
-    if (soap->version == 1)
-    {   if (!soap->fault->detail)
-        {   soap->fault->detail = (struct SOAP_ENV__Detail*)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail));
-            soap_default_SOAP_ENV__Detail(soap, soap->fault->detail);
-        }
-        return (const char**)&soap->fault->detail->__any;
-    }
-    if (!soap->fault->SOAP_ENV__Detail)
-    {   soap->fault->SOAP_ENV__Detail = soap_new_SOAP_ENV__Detail(soap, -1);
-        soap_default_SOAP_ENV__Detail(soap, soap->fault->SOAP_ENV__Detail);
-    }
-    return (const char**)&soap->fault->SOAP_ENV__Detail->__any;
+	soap_fault(soap);
+	if (soap->version == 1)
+	{	if (!soap->fault->detail)
+		{	soap->fault->detail = (struct SOAP_ENV__Detail*)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail));
+			soap_default_SOAP_ENV__Detail(soap, soap->fault->detail);
+		}
+		return (const char**)&soap->fault->detail->__any;
+	}
+	if (!soap->fault->SOAP_ENV__Detail)
+	{	soap->fault->SOAP_ENV__Detail = soap_new_SOAP_ENV__Detail(soap, -1);
+		soap_default_SOAP_ENV__Detail(soap, soap->fault->SOAP_ENV__Detail);
+	}
+	return (const char**)&soap->fault->SOAP_ENV__Detail->__any;
 }
 
 #endif
@@ -131,14 +138,17 @@ SOAP_FMAC3 const char ** SOAP_FMAC4 soap_faultdetail(struct soap *soap)
 #ifndef WITH_NOIDREF
 SOAP_FMAC3 int SOAP_FMAC4 soap_getindependent(struct soap *soap)
 {
-    int t;
-    for (;;)
-        if (!soap_getelement(soap, &t))
-            if (soap->error || soap_ignore_element(soap))
-                break;
-    if (soap->error == SOAP_NO_TAG || soap->error == SOAP_EOF)
-        soap->error = SOAP_OK;
-    return soap->error;
+	int t;
+	if (soap->version == 1)
+	{	for (;;)
+		{	if (!soap_getelement(soap, &t))
+				if (soap->error || soap_ignore_element(soap))
+					break;
+		}
+	}
+	if (soap->error == SOAP_NO_TAG || soap->error == SOAP_EOF)
+		soap->error = SOAP_OK;
+	return soap->error;
 }
 #endif
 
@@ -149,64 +159,69 @@ extern "C" {
 #endif
 SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 {
-    if (soap_peek_element(soap))
-        return NULL;
-    if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id)))
-        *type = soap_lookup_type(soap, soap->href);
-    switch (*type)
-    {
-    case SOAP_TYPE_byte:
-        return soap_in_byte(soap, NULL, NULL, "xsd:byte");
-    case SOAP_TYPE_int:
-        return soap_in_int(soap, NULL, NULL, "xsd:int");
-    case SOAP_TYPE_ns1__executeCommand:
-        return soap_in_ns1__executeCommand(soap, NULL, NULL, "ns1:executeCommand");
-    case SOAP_TYPE_ns1__executeCommandResponse:
-        return soap_in_ns1__executeCommandResponse(soap, NULL, NULL, "ns1:executeCommandResponse");
-    case SOAP_TYPE_PointerTostring:
-        return soap_in_PointerTostring(soap, NULL, NULL, "xsd:string");
-    case SOAP_TYPE_string:
-    {   char **s;
-        s = soap_in_string(soap, NULL, NULL, "xsd:string");
-        return s ? *s : NULL;
-    }
-    default:
-    {   const char *t = soap->type;
-        if (!*t)
-            t = soap->tag;
-        if (!soap_match_tag(soap, t, "xsd:byte"))
-        {   *type = SOAP_TYPE_byte;
-            return soap_in_byte(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "xsd:int"))
-        {   *type = SOAP_TYPE_int;
-            return soap_in_int(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns1:executeCommand"))
-        {   *type = SOAP_TYPE_ns1__executeCommand;
-            return soap_in_ns1__executeCommand(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "ns1:executeCommandResponse"))
-        {   *type = SOAP_TYPE_ns1__executeCommandResponse;
-            return soap_in_ns1__executeCommandResponse(soap, NULL, NULL, NULL);
-        }
-        if (!soap_match_tag(soap, t, "xsd:string"))
-        {   char **s;
-            *type = SOAP_TYPE_string;
-            s = soap_in_string(soap, NULL, NULL, NULL);
-            return s ? *s : NULL;
-        }
-        t = soap->tag;
-        if (!soap_match_tag(soap, t, "xsd:QName"))
-        {   char **s;
-            *type = SOAP_TYPE__QName;
-            s = soap_in__QName(soap, NULL, NULL, NULL);
-            return s ? *s : NULL;
-        }
-    }
-    }
-    soap->error = SOAP_TAG_MISMATCH;
-    return NULL;
+	if (soap_peek_element(soap))
+		return NULL;
+	if (!*soap->id || !(*type = soap_lookup_type(soap, soap->id)))
+		*type = soap_lookup_type(soap, soap->href);
+	switch (*type)
+	{
+	case SOAP_TYPE_byte:
+		return soap_in_byte(soap, NULL, NULL, "xsd:byte");
+	case SOAP_TYPE_int:
+		return soap_in_int(soap, NULL, NULL, "xsd:int");
+	case SOAP_TYPE_ns1__executeCommand:
+		return soap_in_ns1__executeCommand(soap, NULL, NULL, "ns1:executeCommand");
+	case SOAP_TYPE_ns1__executeCommandResponse:
+		return soap_in_ns1__executeCommandResponse(soap, NULL, NULL, "ns1:executeCommandResponse");
+	case SOAP_TYPE_PointerTostring:
+		return soap_in_PointerTostring(soap, NULL, NULL, "xsd:string");
+	case SOAP_TYPE__QName:
+	{	char **s;
+		s = soap_in__QName(soap, NULL, NULL, "xsd:QName");
+		return s ? *s : NULL;
+	}
+	case SOAP_TYPE_string:
+	{	char **s;
+		s = soap_in_string(soap, NULL, NULL, "xsd:string");
+		return s ? *s : NULL;
+	}
+	default:
+	{	const char *t = soap->type;
+		if (!*t)
+			t = soap->tag;
+		if (!soap_match_tag(soap, t, "xsd:byte"))
+		{	*type = SOAP_TYPE_byte;
+			return soap_in_byte(soap, NULL, NULL, NULL);
+		}
+		if (!soap_match_tag(soap, t, "xsd:int"))
+		{	*type = SOAP_TYPE_int;
+			return soap_in_int(soap, NULL, NULL, NULL);
+		}
+		if (!soap_match_tag(soap, t, "ns1:executeCommand"))
+		{	*type = SOAP_TYPE_ns1__executeCommand;
+			return soap_in_ns1__executeCommand(soap, NULL, NULL, NULL);
+		}
+		if (!soap_match_tag(soap, t, "ns1:executeCommandResponse"))
+		{	*type = SOAP_TYPE_ns1__executeCommandResponse;
+			return soap_in_ns1__executeCommandResponse(soap, NULL, NULL, NULL);
+		}
+		if (!soap_match_tag(soap, t, "xsd:QName"))
+		{	char **s;
+			*type = SOAP_TYPE__QName;
+			s = soap_in__QName(soap, NULL, NULL, NULL);
+			return s ? *s : NULL;
+		}
+		if (!soap_match_tag(soap, t, "xsd:string"))
+		{	char **s;
+			*type = SOAP_TYPE_string;
+			s = soap_in_string(soap, NULL, NULL, NULL);
+			return s ? *s : NULL;
+		}
+		t = soap->tag;
+	}
+	}
+	soap->error = SOAP_TAG_MISMATCH;
+	return NULL;
 }
 
 #ifdef __cplusplus
@@ -216,46 +231,46 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_ignore_element(struct soap *soap)
 {
-    if (!soap_peek_element(soap))
-    {   int t;
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Unexpected element '%s' in input (level=%u, %d)\n", soap->tag, soap->level, soap->body));
-        if (soap->mustUnderstand && !soap->other)
-            return soap->error = SOAP_MUSTUNDERSTAND;
-        if (((soap->mode & SOAP_XML_STRICT) && soap->part != SOAP_IN_HEADER) || !soap_match_tag(soap, soap->tag, "SOAP-ENV:"))
-        {   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "REJECTING element '%s'\n", soap->tag));
-            return soap->error = SOAP_TAG_MISMATCH;
-        }
-        if (!*soap->id || !soap_getelement(soap, &t))
-        {   soap->peeked = 0;
-            if (soap->fignore)
-                soap->error = soap->fignore(soap, soap->tag);
-            else
-                soap->error = SOAP_OK;
-            DBGLOG(TEST, if (!soap->error) SOAP_MESSAGE(fdebug, "IGNORING element '%s'\n", soap->tag));
-            if (!soap->error && soap->body)
-            {   soap->level++;
-                while (!soap_ignore_element(soap))
-                    ;
-                if (soap->error == SOAP_NO_TAG)
-                    soap->error = soap_element_end_in(soap, NULL);
-            }
-        }
-    }
-    return soap->error;
+	if (!soap_peek_element(soap))
+	{	int t;
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Unexpected element '%s' in input (level=%u, %d)\n", soap->tag, soap->level, soap->body));
+		if (soap->mustUnderstand && !soap->other)
+			return soap->error = SOAP_MUSTUNDERSTAND;
+		if (((soap->mode & SOAP_XML_STRICT) && soap->part != SOAP_IN_HEADER) || !soap_match_tag(soap, soap->tag, "SOAP-ENV:"))
+		{	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "REJECTING element '%s'\n", soap->tag));
+			return soap->error = SOAP_TAG_MISMATCH;
+		}
+		if (!*soap->id || !soap_getelement(soap, &t))
+		{	soap->peeked = 0;
+			if (soap->fignore)
+				soap->error = soap->fignore(soap, soap->tag);
+			else
+				soap->error = SOAP_OK;
+			DBGLOG(TEST, if (!soap->error) SOAP_MESSAGE(fdebug, "IGNORING element '%s'\n", soap->tag));
+			if (!soap->error && soap->body)
+			{	soap->level++;
+				while (!soap_ignore_element(soap))
+					;
+				if (soap->error == SOAP_NO_TAG)
+					soap->error = soap_element_end_in(soap, NULL);
+			}
+		}
+	}
+	return soap->error;
 }
 
 #ifndef WITH_NOIDREF
 SOAP_FMAC3 int SOAP_FMAC4 soap_putindependent(struct soap *soap)
 {
-    int i;
-    struct soap_plist *pp;
-    if (soap->version == 1 && soap->encodingStyle && !(soap->mode & (SOAP_XML_TREE | SOAP_XML_GRAPH)))
-        for (i = 0; i < SOAP_PTRHASH; i++)
-            for (pp = soap->pht[i]; pp; pp = pp->next)
-                if (pp->mark1 == 2 || pp->mark2 == 2)
-                    if (soap_putelement(soap, pp->ptr, "id", pp->id, pp->type))
-                        return soap->error;
-    return SOAP_OK;
+	int i;
+	struct soap_plist *pp;
+	if (soap->version == 1 && soap->encodingStyle && !(soap->mode & (SOAP_XML_TREE | SOAP_XML_GRAPH)))
+		for (i = 0; i < SOAP_PTRHASH; i++)
+			for (pp = soap->pht[i]; pp; pp = pp->next)
+				if (pp->mark1 == 2 || pp->mark2 == 2)
+					if (soap_putelement(soap, pp->ptr, "id", pp->id, pp->type))
+						return soap->error;
+	return SOAP_OK;
 }
 #endif
 
@@ -266,24 +281,24 @@ extern "C" {
 #endif
 SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, const char *tag, int id, int type)
 {
-    switch (type)
-    {
-    case SOAP_TYPE_byte:
-        return soap_out_byte(soap, tag, id, (const char *)ptr, "xsd:byte");
-    case SOAP_TYPE_int:
-        return soap_out_int(soap, tag, id, (const int *)ptr, "xsd:int");
-    case SOAP_TYPE_ns1__executeCommand:
-        return soap_out_ns1__executeCommand(soap, tag, id, (const struct ns1__executeCommand *)ptr, "ns1:executeCommand");
-    case SOAP_TYPE_ns1__executeCommandResponse:
-        return soap_out_ns1__executeCommandResponse(soap, tag, id, (const struct ns1__executeCommandResponse *)ptr, "ns1:executeCommandResponse");
-    case SOAP_TYPE_PointerTostring:
-        return soap_out_PointerTostring(soap, tag, id, (char **const*)ptr, "xsd:string");
-    case SOAP_TYPE__QName:
-        return soap_out_string(soap, "xsd:QName", id, (char*const*)&ptr, NULL);
-    case SOAP_TYPE_string:
-        return soap_out_string(soap, tag, id, (char*const*)&ptr, "xsd:string");
-    }
-    return SOAP_OK;
+	switch (type)
+	{
+	case SOAP_TYPE_byte:
+		return soap_out_byte(soap, tag, id, (const char *)ptr, "xsd:byte");
+	case SOAP_TYPE_int:
+		return soap_out_int(soap, tag, id, (const int *)ptr, "xsd:int");
+	case SOAP_TYPE_ns1__executeCommand:
+		return soap_out_ns1__executeCommand(soap, tag, id, (const struct ns1__executeCommand *)ptr, "ns1:executeCommand");
+	case SOAP_TYPE_ns1__executeCommandResponse:
+		return soap_out_ns1__executeCommandResponse(soap, tag, id, (const struct ns1__executeCommandResponse *)ptr, "ns1:executeCommandResponse");
+	case SOAP_TYPE_PointerTostring:
+		return soap_out_PointerTostring(soap, tag, id, (char **const*)ptr, "xsd:string");
+	case SOAP_TYPE__QName:
+		return soap_out_string(soap, tag, id, (char*const*)&ptr, "xsd:QName");
+	case SOAP_TYPE_string:
+		return soap_out_string(soap, tag, id, (char*const*)&ptr, "xsd:string");
+	}
+	return SOAP_OK;
 }
 
 #ifdef __cplusplus
@@ -298,25 +313,25 @@ extern "C" {
 #endif
 SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr, int type)
 {
-    (void)soap; (void)ptr; (void)type; /* appease -Wall -Werror */
-    switch (type)
-    {
-    case SOAP_TYPE_ns1__executeCommand:
-        soap_serialize_ns1__executeCommand(soap, (const struct ns1__executeCommand *)ptr);
-        break;
-    case SOAP_TYPE_ns1__executeCommandResponse:
-        soap_serialize_ns1__executeCommandResponse(soap, (const struct ns1__executeCommandResponse *)ptr);
-        break;
-    case SOAP_TYPE_PointerTostring:
-        soap_serialize_PointerTostring(soap, (char **const*)ptr);
-        break;
-    case SOAP_TYPE__QName:
-        soap_serialize_string(soap, (char*const*)&ptr);
-        break;
-    case SOAP_TYPE_string:
-        soap_serialize_string(soap, (char*const*)&ptr);
-        break;
-    }
+	(void)soap; (void)ptr; (void)type; /* appease -Wall -Werror */
+	switch (type)
+	{
+	case SOAP_TYPE_ns1__executeCommand:
+		soap_serialize_ns1__executeCommand(soap, (const struct ns1__executeCommand *)ptr);
+		break;
+	case SOAP_TYPE_ns1__executeCommandResponse:
+		soap_serialize_ns1__executeCommandResponse(soap, (const struct ns1__executeCommandResponse *)ptr);
+		break;
+	case SOAP_TYPE_PointerTostring:
+		soap_serialize_PointerTostring(soap, (char **const*)ptr);
+		break;
+	case SOAP_TYPE__QName:
+		soap_serialize_string(soap, (char*const*)&ptr);
+		break;
+	case SOAP_TYPE_string:
+		soap_serialize_string(soap, (char*const*)&ptr);
+		break;
+	}
 }
 
 #ifdef __cplusplus
@@ -326,343 +341,350 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 
 SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const char *type, const char *arrayType, size_t *n)
 {
-    switch (t)
-    {
-    case SOAP_TYPE_ns1__executeCommandResponse:
-        return (void*)soap_instantiate_ns1__executeCommandResponse(soap, -1, type, arrayType, n);
-    case SOAP_TYPE_ns1__executeCommand:
-        return (void*)soap_instantiate_ns1__executeCommand(soap, -1, type, arrayType, n);
+	switch (t)
+	{
+	case SOAP_TYPE_ns1__executeCommandResponse:
+		return (void*)soap_instantiate_ns1__executeCommandResponse(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ns1__executeCommand:
+		return (void*)soap_instantiate_ns1__executeCommand(soap, -1, type, arrayType, n);
 #ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Header:
-        return (void*)soap_instantiate_SOAP_ENV__Header(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_SOAP_ENV__Header:
+		return (void*)soap_instantiate_SOAP_ENV__Header(soap, -1, type, arrayType, n);
 #endif
 #ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Code:
-        return (void*)soap_instantiate_SOAP_ENV__Code(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_SOAP_ENV__Code:
+		return (void*)soap_instantiate_SOAP_ENV__Code(soap, -1, type, arrayType, n);
 #endif
 #ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Detail:
-        return (void*)soap_instantiate_SOAP_ENV__Detail(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_SOAP_ENV__Detail:
+		return (void*)soap_instantiate_SOAP_ENV__Detail(soap, -1, type, arrayType, n);
 #endif
 #ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Reason:
-        return (void*)soap_instantiate_SOAP_ENV__Reason(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_SOAP_ENV__Reason:
+		return (void*)soap_instantiate_SOAP_ENV__Reason(soap, -1, type, arrayType, n);
 #endif
 #ifndef WITH_NOGLOBAL
-    case SOAP_TYPE_SOAP_ENV__Fault:
-        return (void*)soap_instantiate_SOAP_ENV__Fault(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_SOAP_ENV__Fault:
+		return (void*)soap_instantiate_SOAP_ENV__Fault(soap, -1, type, arrayType, n);
 #endif
-    }
-    return NULL;
+	}
+	return NULL;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
-{   switch (p->type)
-    {
-    case SOAP_TYPE_ns1__executeCommandResponse:
-        if (p->size < 0)
-            delete (struct ns1__executeCommandResponse*)p->ptr;
-        else
-            delete[] (struct ns1__executeCommandResponse*)p->ptr;
-        break;
-    case SOAP_TYPE_ns1__executeCommand:
-        if (p->size < 0)
-            delete (struct ns1__executeCommand*)p->ptr;
-        else
-            delete[] (struct ns1__executeCommand*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Header:
-        if (p->size < 0)
-            delete (struct SOAP_ENV__Header*)p->ptr;
-        else
-            delete[] (struct SOAP_ENV__Header*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Code:
-        if (p->size < 0)
-            delete (struct SOAP_ENV__Code*)p->ptr;
-        else
-            delete[] (struct SOAP_ENV__Code*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Detail:
-        if (p->size < 0)
-            delete (struct SOAP_ENV__Detail*)p->ptr;
-        else
-            delete[] (struct SOAP_ENV__Detail*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Reason:
-        if (p->size < 0)
-            delete (struct SOAP_ENV__Reason*)p->ptr;
-        else
-            delete[] (struct SOAP_ENV__Reason*)p->ptr;
-        break;
-    case SOAP_TYPE_SOAP_ENV__Fault:
-        if (p->size < 0)
-            delete (struct SOAP_ENV__Fault*)p->ptr;
-        else
-            delete[] (struct SOAP_ENV__Fault*)p->ptr;
-        break;
-    default:    return SOAP_ERR;
-    }
-    return SOAP_OK;
+{	switch (p->type)
+	{
+	case SOAP_TYPE_ns1__executeCommandResponse:
+		if (p->size < 0)
+			SOAP_DELETE((struct ns1__executeCommandResponse*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct ns1__executeCommandResponse*)p->ptr);
+		break;
+	case SOAP_TYPE_ns1__executeCommand:
+		if (p->size < 0)
+			SOAP_DELETE((struct ns1__executeCommand*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct ns1__executeCommand*)p->ptr);
+		break;
+	case SOAP_TYPE_SOAP_ENV__Header:
+		if (p->size < 0)
+			SOAP_DELETE((struct SOAP_ENV__Header*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct SOAP_ENV__Header*)p->ptr);
+		break;
+	case SOAP_TYPE_SOAP_ENV__Code:
+		if (p->size < 0)
+			SOAP_DELETE((struct SOAP_ENV__Code*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct SOAP_ENV__Code*)p->ptr);
+		break;
+	case SOAP_TYPE_SOAP_ENV__Detail:
+		if (p->size < 0)
+			SOAP_DELETE((struct SOAP_ENV__Detail*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct SOAP_ENV__Detail*)p->ptr);
+		break;
+	case SOAP_TYPE_SOAP_ENV__Reason:
+		if (p->size < 0)
+			SOAP_DELETE((struct SOAP_ENV__Reason*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct SOAP_ENV__Reason*)p->ptr);
+		break;
+	case SOAP_TYPE_SOAP_ENV__Fault:
+		if (p->size < 0)
+			SOAP_DELETE((struct SOAP_ENV__Fault*)p->ptr);
+		else
+			SOAP_DELETE_ARRAY((struct SOAP_ENV__Fault*)p->ptr);
+		break;
+	default:	return SOAP_ERR;
+	}
+	return SOAP_OK;
 }
 
 SOAP_FMAC3 void* SOAP_FMAC4 soap_class_id_enter(struct soap *soap, const char *id, void *p, int t, size_t n, const char *type, const char *arrayType)
-{   return soap_id_enter(soap, id, p, t, n, 0, type, arrayType, soap_instantiate);
+{	return soap_id_enter(soap, id, p, t, n, 0, type, arrayType, soap_instantiate);
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_byte(struct soap *soap, char *a)
-{   (void)soap; /* appease -Wall -Werror */
+{
+	(void)soap; /* appease -Wall -Werror */
 #ifdef SOAP_DEFAULT_byte
-    *a = SOAP_DEFAULT_byte;
+	*a = SOAP_DEFAULT_byte;
 #else
-    *a = (char)0;
+	*a = (char)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap *soap, const char *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_byte(struct soap *soap, const char *tag, int id, const char *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_byte);
-    if (soap_out_byte(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	return soap_outbyte(soap, tag, id, a, type, SOAP_TYPE_byte);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_byte(struct soap *soap, const char *tag, int id, const char *a, const char *type)
-{
-    return soap_outbyte(soap, tag, id, a, type, SOAP_TYPE_byte);
+SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type)
+{	char *p;
+	p = soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+	return p;
 }
 
-SOAP_FMAC3 char * SOAP_FMAC4 soap_get_byte(struct soap *soap, char *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap *soap, const char *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_byte(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_byte);
+	if (soap_out_byte(soap, tag?tag:"byte", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap *soap, const char *tag, char *a, const char *type)
+SOAP_FMAC3 char * SOAP_FMAC4 soap_get_byte(struct soap *soap, char *p, const char *tag, const char *type)
 {
-    return soap_inbyte(soap, tag, a, type, SOAP_TYPE_byte);
+	if ((p = soap_in_byte(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_int(struct soap *soap, int *a)
-{   (void)soap; /* appease -Wall -Werror */
+{
+	(void)soap; /* appease -Wall -Werror */
 #ifdef SOAP_DEFAULT_int
-    *a = SOAP_DEFAULT_int;
+	*a = SOAP_DEFAULT_int;
 #else
-    *a = (int)0;
+	*a = (int)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap *soap, const int *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_int(struct soap *soap, const char *tag, int id, const int *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_int);
-    if (soap_out_int(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	return soap_outint(soap, tag, id, a, type, SOAP_TYPE_int);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_int(struct soap *soap, const char *tag, int id, const int *a, const char *type)
-{
-    return soap_outint(soap, tag, id, a, type, SOAP_TYPE_int);
+SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap *soap, const char *tag, int *a, const char *type)
+{	int *p;
+	p = soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+	return p;
 }
 
-SOAP_FMAC3 int * SOAP_FMAC4 soap_get_int(struct soap *soap, int *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap *soap, const int *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_int(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_int);
+	if (soap_out_int(soap, tag?tag:"int", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap *soap, const char *tag, int *a, const char *type)
+SOAP_FMAC3 int * SOAP_FMAC4 soap_get_int(struct soap *soap, int *p, const char *tag, const char *type)
 {
-    return soap_inint(soap, tag, a, type, SOAP_TYPE_int);
+	if ((p = soap_in_int(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 #ifndef WITH_NOGLOBAL
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_default__QName(soap, &a->faultcode);
-    soap_default_string(soap, &a->faultstring);
-    soap_default_string(soap, &a->faultactor);
-    a->detail = NULL;
-    a->SOAP_ENV__Code = NULL;
-    a->SOAP_ENV__Reason = NULL;
-    soap_default_string(soap, &a->SOAP_ENV__Node);
-    soap_default_string(soap, &a->SOAP_ENV__Role);
-    a->SOAP_ENV__Detail = NULL;
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_default__QName(soap, &a->faultcode);
+	soap_default_string(soap, &a->faultstring);
+	soap_default_string(soap, &a->faultactor);
+	a->detail = NULL;
+	a->SOAP_ENV__Code = NULL;
+	a->SOAP_ENV__Reason = NULL;
+	soap_default_string(soap, &a->SOAP_ENV__Node);
+	soap_default_string(soap, &a->SOAP_ENV__Role);
+	a->SOAP_ENV__Detail = NULL;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Fault(struct soap *soap, const struct SOAP_ENV__Fault *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize__QName(soap, &a->faultcode);
-    soap_serialize_string(soap, &a->faultstring);
-    soap_serialize_string(soap, &a->faultactor);
-    soap_serialize_PointerToSOAP_ENV__Detail(soap, &a->detail);
-    soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Code);
-    soap_serialize_PointerToSOAP_ENV__Reason(soap, &a->SOAP_ENV__Reason);
-    soap_serialize_string(soap, &a->SOAP_ENV__Node);
-    soap_serialize_string(soap, &a->SOAP_ENV__Role);
-    soap_serialize_PointerToSOAP_ENV__Detail(soap, &a->SOAP_ENV__Detail);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_serialize__QName(soap, &a->faultcode);
+	soap_serialize_string(soap, &a->faultstring);
+	soap_serialize_string(soap, &a->faultactor);
+	soap_serialize_PointerToSOAP_ENV__Detail(soap, &a->detail);
+	soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Code);
+	soap_serialize_PointerToSOAP_ENV__Reason(soap, &a->SOAP_ENV__Reason);
+	soap_serialize_string(soap, &a->SOAP_ENV__Node);
+	soap_serialize_string(soap, &a->SOAP_ENV__Role);
+	soap_serialize_PointerToSOAP_ENV__Detail(soap, &a->SOAP_ENV__Detail);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap *soap, const struct SOAP_ENV__Fault *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Fault *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Fault);
-    if (soap_out_SOAP_ENV__Fault(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	const char *soap_tmp_faultcode = soap_QName2s(soap, a->faultcode);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Fault), type))
+		return soap->error;
+	if (soap_out__QName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, ""))
+		return soap->error;
+	if (soap_out_string(soap, "faultstring", -1, &a->faultstring, ""))
+		return soap->error;
+	if (soap_out_string(soap, "faultactor", -1, &a->faultactor, ""))
+		return soap->error;
+	if (soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, ""))
+		return soap->error;
+	if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Code", -1, &a->SOAP_ENV__Code, ""))
+		return soap->error;
+	if (soap_out_PointerToSOAP_ENV__Reason(soap, "SOAP-ENV:Reason", -1, &a->SOAP_ENV__Reason, ""))
+		return soap->error;
+	if (soap_out_string(soap, "SOAP-ENV:Node", -1, &a->SOAP_ENV__Node, ""))
+		return soap->error;
+	if (soap_out_string(soap, "SOAP-ENV:Role", -1, &a->SOAP_ENV__Role, ""))
+		return soap->error;
+	if (soap_out_PointerToSOAP_ENV__Detail(soap, "SOAP-ENV:Detail", -1, &a->SOAP_ENV__Detail, ""))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Fault(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Fault *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct soap *soap, const char *tag, struct SOAP_ENV__Fault *a, const char *type)
 {
-    const char *soap_tmp_faultcode = soap_QName2s(soap, a->faultcode);
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Fault), type))
-        return soap->error;
-    if (soap_out__QName(soap, "faultcode", -1, (char*const*)&soap_tmp_faultcode, ""))
-        return soap->error;
-    if (soap_out_string(soap, "faultstring", -1, &a->faultstring, ""))
-        return soap->error;
-    if (soap_out_string(soap, "faultactor", -1, &a->faultactor, ""))
-        return soap->error;
-    if (soap_out_PointerToSOAP_ENV__Detail(soap, "detail", -1, &a->detail, ""))
-        return soap->error;
-    if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Code", -1, &a->SOAP_ENV__Code, ""))
-        return soap->error;
-    if (soap_out_PointerToSOAP_ENV__Reason(soap, "SOAP-ENV:Reason", -1, &a->SOAP_ENV__Reason, ""))
-        return soap->error;
-    if (soap_out_string(soap, "SOAP-ENV:Node", -1, &a->SOAP_ENV__Node, ""))
-        return soap->error;
-    if (soap_out_string(soap, "SOAP-ENV:Role", -1, &a->SOAP_ENV__Role, ""))
-        return soap->error;
-    if (soap_out_PointerToSOAP_ENV__Detail(soap, "SOAP-ENV:Detail", -1, &a->SOAP_ENV__Detail, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_faultcode = 1;
+	size_t soap_flag_faultstring = 1;
+	size_t soap_flag_faultactor = 1;
+	size_t soap_flag_detail = 1;
+	size_t soap_flag_SOAP_ENV__Code = 1;
+	size_t soap_flag_SOAP_ENV__Reason = 1;
+	size_t soap_flag_SOAP_ENV__Node = 1;
+	size_t soap_flag_SOAP_ENV__Role = 1;
+	size_t soap_flag_SOAP_ENV__Detail = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct SOAP_ENV__Fault *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Fault, sizeof(struct SOAP_ENV__Fault), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_SOAP_ENV__Fault(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_faultcode && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in__QName(soap, "faultcode", &a->faultcode, ""))
+				{	soap_flag_faultcode--;
+					continue;
+				}
+			if (soap_flag_faultstring && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "faultstring", &a->faultstring, "xsd:string"))
+				{	soap_flag_faultstring--;
+					continue;
+				}
+			if (soap_flag_faultactor && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "faultactor", &a->faultactor, "xsd:string"))
+				{	soap_flag_faultactor--;
+					continue;
+				}
+			if (soap_flag_detail && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerToSOAP_ENV__Detail(soap, "detail", &a->detail, ""))
+				{	soap_flag_detail--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Code && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Code", &a->SOAP_ENV__Code, ""))
+				{	soap_flag_SOAP_ENV__Code--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Reason && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerToSOAP_ENV__Reason(soap, "SOAP-ENV:Reason", &a->SOAP_ENV__Reason, ""))
+				{	soap_flag_SOAP_ENV__Reason--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Node && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "SOAP-ENV:Node", &a->SOAP_ENV__Node, "xsd:string"))
+				{	soap_flag_SOAP_ENV__Node--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Role && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "SOAP-ENV:Role", &a->SOAP_ENV__Role, "xsd:string"))
+				{	soap_flag_SOAP_ENV__Role--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Detail && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerToSOAP_ENV__Detail(soap, "SOAP-ENV:Detail", &a->SOAP_ENV__Detail, ""))
+				{	soap_flag_SOAP_ENV__Detail--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Fault *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Fault, 0, sizeof(struct SOAP_ENV__Fault), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_get_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap *soap, const struct SOAP_ENV__Fault *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_SOAP_ENV__Fault(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Fault);
+	if (soap_out_SOAP_ENV__Fault(soap, tag?tag:"SOAP-ENV:Fault", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct soap *soap, const char *tag, struct SOAP_ENV__Fault *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_get_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *p, const char *tag, const char *type)
 {
-    short soap_flag_faultcode = 1, soap_flag_faultstring = 1, soap_flag_faultactor = 1, soap_flag_detail = 1, soap_flag_SOAP_ENV__Code = 1, soap_flag_SOAP_ENV__Reason = 1, soap_flag_SOAP_ENV__Node = 1, soap_flag_SOAP_ENV__Role = 1, soap_flag_SOAP_ENV__Detail = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct SOAP_ENV__Fault *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Fault, sizeof(struct SOAP_ENV__Fault), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_SOAP_ENV__Fault(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_faultcode && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in__QName(soap, "faultcode", &a->faultcode, ""))
-                {   soap_flag_faultcode--;
-                    continue;
-                }
-            if (soap_flag_faultstring && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "faultstring", &a->faultstring, "xsd:string"))
-                {   soap_flag_faultstring--;
-                    continue;
-                }
-            if (soap_flag_faultactor && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "faultactor", &a->faultactor, "xsd:string"))
-                {   soap_flag_faultactor--;
-                    continue;
-                }
-            if (soap_flag_detail && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerToSOAP_ENV__Detail(soap, "detail", &a->detail, ""))
-                {   soap_flag_detail--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Code && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Code", &a->SOAP_ENV__Code, ""))
-                {   soap_flag_SOAP_ENV__Code--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Reason && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerToSOAP_ENV__Reason(soap, "SOAP-ENV:Reason", &a->SOAP_ENV__Reason, ""))
-                {   soap_flag_SOAP_ENV__Reason--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Node && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "SOAP-ENV:Node", &a->SOAP_ENV__Node, "xsd:string"))
-                {   soap_flag_SOAP_ENV__Node--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Role && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "SOAP-ENV:Role", &a->SOAP_ENV__Role, "xsd:string"))
-                {   soap_flag_SOAP_ENV__Role--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Detail && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerToSOAP_ENV__Detail(soap, "SOAP-ENV:Detail", &a->SOAP_ENV__Detail, ""))
-                {   soap_flag_SOAP_ENV__Detail--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Fault *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Fault, 0, sizeof(struct SOAP_ENV__Fault), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct SOAP_ENV__Fault * SOAP_FMAC6 soap_new_SOAP_ENV__Fault(struct soap *soap, int n)
-{   return soap_instantiate_SOAP_ENV__Fault(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_SOAP_ENV__Fault(struct soap *soap, struct SOAP_ENV__Fault *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_instantiate_SOAP_ENV__Fault(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Fault(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Fault, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct SOAP_ENV__Fault;
-        if (size)
-            *size = sizeof(struct SOAP_ENV__Fault);
-    }
-    else
-    {   cp->ptr = (void*)new struct SOAP_ENV__Fault[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct SOAP_ENV__Fault);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct SOAP_ENV__Fault*)cp->ptr;
+	if ((p = soap_in_SOAP_ENV__Fault(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Fault(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Fault, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Fault);
+		if (size)
+			*size = sizeof(struct SOAP_ENV__Fault);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Fault[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct SOAP_ENV__Fault);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct SOAP_ENV__Fault*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Fault(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Fault %p -> %p\n", q, p));
-    *(struct SOAP_ENV__Fault*)p = *(struct SOAP_ENV__Fault*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Fault %p -> %p\n", q, p));
+	*(struct SOAP_ENV__Fault*)p = *(struct SOAP_ENV__Fault*)q;
 }
 
 #endif
@@ -671,112 +693,109 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Fault(struct soap *soap, int st,
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_default_string(soap, &a->SOAP_ENV__Text);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_default_string(soap, &a->SOAP_ENV__Text);
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Reason(struct soap *soap, const struct SOAP_ENV__Reason *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize_string(soap, &a->SOAP_ENV__Text);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_serialize_string(soap, &a->SOAP_ENV__Text);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Reason(struct soap *soap, const struct SOAP_ENV__Reason *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Reason(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Reason *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Reason);
-    if (soap_out_SOAP_ENV__Reason(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Reason), type))
+		return soap->error;
+	if (soap->lang)
+		soap_set_attr(soap, "xml:lang", soap->lang, 1);
+	if (soap_out_string(soap, "SOAP-ENV:Text", -1, &a->SOAP_ENV__Text, ""))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Reason(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Reason *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct soap *soap, const char *tag, struct SOAP_ENV__Reason *a, const char *type)
 {
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Reason), type))
-        return soap->error;
-    if (soap_out_string(soap, "SOAP-ENV:Text", -1, &a->SOAP_ENV__Text, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_SOAP_ENV__Text = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct SOAP_ENV__Reason *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_SOAP_ENV__Reason(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_SOAP_ENV__Text && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "SOAP-ENV:Text", &a->SOAP_ENV__Text, "xsd:string"))
+				{	soap_flag_SOAP_ENV__Text--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Reason *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Reason, 0, sizeof(struct SOAP_ENV__Reason), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_get_SOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Reason(struct soap *soap, const struct SOAP_ENV__Reason *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_SOAP_ENV__Reason(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Reason);
+	if (soap_out_SOAP_ENV__Reason(soap, tag?tag:"SOAP-ENV:Reason", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct soap *soap, const char *tag, struct SOAP_ENV__Reason *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_get_SOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *p, const char *tag, const char *type)
 {
-    short soap_flag_SOAP_ENV__Text = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct SOAP_ENV__Reason *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_SOAP_ENV__Reason(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_SOAP_ENV__Text && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "SOAP-ENV:Text", &a->SOAP_ENV__Text, "xsd:string"))
-                {   soap_flag_SOAP_ENV__Text--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Reason *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Reason, 0, sizeof(struct SOAP_ENV__Reason), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct SOAP_ENV__Reason * SOAP_FMAC6 soap_new_SOAP_ENV__Reason(struct soap *soap, int n)
-{   return soap_instantiate_SOAP_ENV__Reason(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_SOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_instantiate_SOAP_ENV__Reason(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Reason(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Reason, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct SOAP_ENV__Reason;
-        if (size)
-            *size = sizeof(struct SOAP_ENV__Reason);
-    }
-    else
-    {   cp->ptr = (void*)new struct SOAP_ENV__Reason[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct SOAP_ENV__Reason);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct SOAP_ENV__Reason*)cp->ptr;
+	if ((p = soap_in_SOAP_ENV__Reason(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reason(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Reason(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Reason, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Reason);
+		if (size)
+			*size = sizeof(struct SOAP_ENV__Reason);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Reason[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct SOAP_ENV__Reason);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct SOAP_ENV__Reason*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Reason(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Reason %p -> %p\n", q, p));
-    *(struct SOAP_ENV__Reason*)p = *(struct SOAP_ENV__Reason*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Reason %p -> %p\n", q, p));
+	*(struct SOAP_ENV__Reason*)p = *(struct SOAP_ENV__Reason*)q;
 }
 
 #endif
@@ -785,120 +804,116 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Reason(struct soap *soap, int st,
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    a->__type = 0;
-    a->fault = NULL;
-    a->__any = NULL;
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	a->__type = 0;
+	a->fault = NULL;
+	a->__any = NULL;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_markelement(soap, a->fault, a->__type);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_markelement(soap, a->fault, a->__type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Detail *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Detail);
-    if (soap_out_SOAP_ENV__Detail(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Detail), type))
+		return soap->error;
+	if (soap_putelement(soap, a->fault, "fault", -1, a->__type))
+		return soap->error;
+	soap_outliteral(soap, "-any", &a->__any, NULL);
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Detail(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Detail *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail *a, const char *type)
 {
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Detail), type))
-        return soap->error;
-    if (soap_putelement(soap, a->fault, "fault", -1, a->__type))
-        return soap->error;
-    soap_outliteral(soap, "-any", &a->__any, NULL);
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_fault = 1;
+	size_t soap_flag___any = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct SOAP_ENV__Detail *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_SOAP_ENV__Detail(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_fault && soap->error == SOAP_TAG_MISMATCH)
+				if ((a->fault = soap_getelement(soap, &a->__type)))
+				{	soap_flag_fault = 0;
+					continue;
+				}
+			if (soap_flag___any && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_inliteral(soap, "-any", &a->__any))
+				{	soap_flag___any--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Detail *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Detail, 0, sizeof(struct SOAP_ENV__Detail), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_get_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Detail(struct soap *soap, const struct SOAP_ENV__Detail *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_SOAP_ENV__Detail(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Detail);
+	if (soap_out_SOAP_ENV__Detail(soap, tag?tag:"SOAP-ENV:Detail", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_get_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *p, const char *tag, const char *type)
 {
-    short soap_flag_fault = 1, soap_flag___any = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct SOAP_ENV__Detail *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_SOAP_ENV__Detail(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_fault && soap->error == SOAP_TAG_MISMATCH)
-                if ((a->fault = soap_getelement(soap, &a->__type)))
-                {   soap_flag_fault = 0;
-                    continue;
-                }
-            if (soap_flag___any && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_inliteral(soap, "-any", &a->__any))
-                {   soap_flag___any--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Detail *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Detail, 0, sizeof(struct SOAP_ENV__Detail), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct SOAP_ENV__Detail * SOAP_FMAC6 soap_new_SOAP_ENV__Detail(struct soap *soap, int n)
-{   return soap_instantiate_SOAP_ENV__Detail(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_SOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_instantiate_SOAP_ENV__Detail(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Detail(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Detail, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct SOAP_ENV__Detail;
-        if (size)
-            *size = sizeof(struct SOAP_ENV__Detail);
-    }
-    else
-    {   cp->ptr = (void*)new struct SOAP_ENV__Detail[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct SOAP_ENV__Detail);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct SOAP_ENV__Detail*)cp->ptr;
+	if ((p = soap_in_SOAP_ENV__Detail(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detail(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Detail(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Detail, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Detail);
+		if (size)
+			*size = sizeof(struct SOAP_ENV__Detail);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Detail[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct SOAP_ENV__Detail);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct SOAP_ENV__Detail*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Detail(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Detail %p -> %p\n", q, p));
-    *(struct SOAP_ENV__Detail*)p = *(struct SOAP_ENV__Detail*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Detail %p -> %p\n", q, p));
+	*(struct SOAP_ENV__Detail*)p = *(struct SOAP_ENV__Detail*)q;
 }
 
 #endif
@@ -907,122 +922,118 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Detail(struct soap *soap, int st,
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_default__QName(soap, &a->SOAP_ENV__Value);
-    a->SOAP_ENV__Subcode = NULL;
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_default__QName(soap, &a->SOAP_ENV__Value);
+	a->SOAP_ENV__Subcode = NULL;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Code(struct soap *soap, const struct SOAP_ENV__Code *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize__QName(soap, &a->SOAP_ENV__Value);
-    soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Subcode);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_serialize__QName(soap, &a->SOAP_ENV__Value);
+	soap_serialize_PointerToSOAP_ENV__Code(soap, &a->SOAP_ENV__Subcode);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap *soap, const struct SOAP_ENV__Code *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Code *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Code);
-    if (soap_out_SOAP_ENV__Code(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	const char *soap_tmp_SOAP_ENV__Value = soap_QName2s(soap, a->SOAP_ENV__Value);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Code), type))
+		return soap->error;
+	if (soap_out__QName(soap, "SOAP-ENV:Value", -1, (char*const*)&soap_tmp_SOAP_ENV__Value, ""))
+		return soap->error;
+	if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", -1, &a->SOAP_ENV__Subcode, ""))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Code(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Code *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap *soap, const char *tag, struct SOAP_ENV__Code *a, const char *type)
 {
-    const char *soap_tmp_SOAP_ENV__Value = soap_QName2s(soap, a->SOAP_ENV__Value);
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Code), type))
-        return soap->error;
-    if (soap_out__QName(soap, "SOAP-ENV:Value", -1, (char*const*)&soap_tmp_SOAP_ENV__Value, ""))
-        return soap->error;
-    if (soap_out_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", -1, &a->SOAP_ENV__Subcode, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_SOAP_ENV__Value = 1;
+	size_t soap_flag_SOAP_ENV__Subcode = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct SOAP_ENV__Code *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_SOAP_ENV__Code(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_SOAP_ENV__Value && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in__QName(soap, "SOAP-ENV:Value", &a->SOAP_ENV__Value, ""))
+				{	soap_flag_SOAP_ENV__Value--;
+					continue;
+				}
+			if (soap_flag_SOAP_ENV__Subcode && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", &a->SOAP_ENV__Subcode, ""))
+				{	soap_flag_SOAP_ENV__Subcode--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Code *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Code, 0, sizeof(struct SOAP_ENV__Code), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_get_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap *soap, const struct SOAP_ENV__Code *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_SOAP_ENV__Code(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Code);
+	if (soap_out_SOAP_ENV__Code(soap, tag?tag:"SOAP-ENV:Code", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap *soap, const char *tag, struct SOAP_ENV__Code *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_get_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *p, const char *tag, const char *type)
 {
-    short soap_flag_SOAP_ENV__Value = 1, soap_flag_SOAP_ENV__Subcode = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct SOAP_ENV__Code *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_SOAP_ENV__Code(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_SOAP_ENV__Value && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in__QName(soap, "SOAP-ENV:Value", &a->SOAP_ENV__Value, ""))
-                {   soap_flag_SOAP_ENV__Value--;
-                    continue;
-                }
-            if (soap_flag_SOAP_ENV__Subcode && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerToSOAP_ENV__Code(soap, "SOAP-ENV:Subcode", &a->SOAP_ENV__Subcode, ""))
-                {   soap_flag_SOAP_ENV__Subcode--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Code *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Code, 0, sizeof(struct SOAP_ENV__Code), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct SOAP_ENV__Code * SOAP_FMAC6 soap_new_SOAP_ENV__Code(struct soap *soap, int n)
-{   return soap_instantiate_SOAP_ENV__Code(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_SOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_instantiate_SOAP_ENV__Code(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Code(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Code, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct SOAP_ENV__Code;
-        if (size)
-            *size = sizeof(struct SOAP_ENV__Code);
-    }
-    else
-    {   cp->ptr = (void*)new struct SOAP_ENV__Code[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct SOAP_ENV__Code);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct SOAP_ENV__Code*)cp->ptr;
+	if ((p = soap_in_SOAP_ENV__Code(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Code(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Code, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Code);
+		if (size)
+			*size = sizeof(struct SOAP_ENV__Code);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Code[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct SOAP_ENV__Code);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct SOAP_ENV__Code*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Code(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Code %p -> %p\n", q, p));
-    *(struct SOAP_ENV__Code*)p = *(struct SOAP_ENV__Code*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Code %p -> %p\n", q, p));
+	*(struct SOAP_ENV__Code*)p = *(struct SOAP_ENV__Code*)q;
 }
 
 #endif
@@ -1031,377 +1042,362 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Code(struct soap *soap, int st, i
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_SOAP_ENV__Header(struct soap *soap, struct SOAP_ENV__Header *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
+	(void)soap; (void)a; /* appease -Wall -Werror */
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_SOAP_ENV__Header(struct soap *soap, const struct SOAP_ENV__Header *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
+	(void)soap; (void)a; /* appease -Wall -Werror */
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Header(struct soap *soap, const struct SOAP_ENV__Header *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Header(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Header *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Header);
-    if (soap_out_SOAP_ENV__Header(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Header), type))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_SOAP_ENV__Header(struct soap *soap, const char *tag, int id, const struct SOAP_ENV__Header *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct soap *soap, const char *tag, struct SOAP_ENV__Header *a, const char *type)
 {
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_SOAP_ENV__Header), type))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct SOAP_ENV__Header *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Header, sizeof(struct SOAP_ENV__Header), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_SOAP_ENV__Header(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Header *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Header, 0, sizeof(struct SOAP_ENV__Header), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_get_SOAP_ENV__Header(struct soap *soap, struct SOAP_ENV__Header *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Header(struct soap *soap, const struct SOAP_ENV__Header *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_SOAP_ENV__Header(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_SOAP_ENV__Header);
+	if (soap_out_SOAP_ENV__Header(soap, tag?tag:"SOAP-ENV:Header", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct soap *soap, const char *tag, struct SOAP_ENV__Header *a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_get_SOAP_ENV__Header(struct soap *soap, struct SOAP_ENV__Header *p, const char *tag, const char *type)
 {
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct SOAP_ENV__Header *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_SOAP_ENV__Header, sizeof(struct SOAP_ENV__Header), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_SOAP_ENV__Header(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Header *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_SOAP_ENV__Header, 0, sizeof(struct SOAP_ENV__Header), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct SOAP_ENV__Header * SOAP_FMAC6 soap_new_SOAP_ENV__Header(struct soap *soap, int n)
-{   return soap_instantiate_SOAP_ENV__Header(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_SOAP_ENV__Header(struct soap *soap, struct SOAP_ENV__Header *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_instantiate_SOAP_ENV__Header(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Header(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Header, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct SOAP_ENV__Header;
-        if (size)
-            *size = sizeof(struct SOAP_ENV__Header);
-    }
-    else
-    {   cp->ptr = (void*)new struct SOAP_ENV__Header[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct SOAP_ENV__Header);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct SOAP_ENV__Header*)cp->ptr;
+	if ((p = soap_in_SOAP_ENV__Header(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Header(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_SOAP_ENV__Header(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_SOAP_ENV__Header, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Header);
+		if (size)
+			*size = sizeof(struct SOAP_ENV__Header);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct SOAP_ENV__Header[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct SOAP_ENV__Header);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct SOAP_ENV__Header*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_SOAP_ENV__Header(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Header %p -> %p\n", q, p));
-    *(struct SOAP_ENV__Header*)p = *(struct SOAP_ENV__Header*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct SOAP_ENV__Header %p -> %p\n", q, p));
+	*(struct SOAP_ENV__Header*)p = *(struct SOAP_ENV__Header*)q;
 }
 
 #endif
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__executeCommand(struct soap *soap, struct ns1__executeCommand *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_default_string(soap, &a->command);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_default_string(soap, &a->command);
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommand(struct soap *soap, const struct ns1__executeCommand *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize_string(soap, &a->command);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_serialize_string(soap, &a->command);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommand(struct soap *soap, const struct ns1__executeCommand *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap *soap, const char *tag, int id, const struct ns1__executeCommand *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommand);
-    if (soap_out_ns1__executeCommand(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommand), type))
+		return soap->error;
+	if (soap_out_string(soap, "command", -1, &a->command, ""))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommand(struct soap *soap, const char *tag, int id, const struct ns1__executeCommand *a, const char *type)
+SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_in_ns1__executeCommand(struct soap *soap, const char *tag, struct ns1__executeCommand *a, const char *type)
 {
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommand), type))
-        return soap->error;
-    if (soap_out_string(soap, "command", -1, &a->command, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_command = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct ns1__executeCommand *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommand, sizeof(struct ns1__executeCommand), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_ns1__executeCommand(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_command && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+				if (soap_in_string(soap, "command", &a->command, "xsd:string"))
+				{	soap_flag_command--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct ns1__executeCommand *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommand, 0, sizeof(struct ns1__executeCommand), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_get_ns1__executeCommand(struct soap *soap, struct ns1__executeCommand *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommand(struct soap *soap, const struct ns1__executeCommand *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_ns1__executeCommand(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommand);
+	if (soap_out_ns1__executeCommand(soap, tag?tag:"ns1:executeCommand", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_in_ns1__executeCommand(struct soap *soap, const char *tag, struct ns1__executeCommand *a, const char *type)
+SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_get_ns1__executeCommand(struct soap *soap, struct ns1__executeCommand *p, const char *tag, const char *type)
 {
-    short soap_flag_command = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct ns1__executeCommand *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommand, sizeof(struct ns1__executeCommand), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_ns1__executeCommand(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_command && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-                if (soap_in_string(soap, "command", &a->command, "xsd:string"))
-                {   soap_flag_command--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct ns1__executeCommand *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommand, 0, sizeof(struct ns1__executeCommand), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct ns1__executeCommand * SOAP_FMAC6 soap_new_ns1__executeCommand(struct soap *soap, int n)
-{   return soap_instantiate_ns1__executeCommand(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns1__executeCommand(struct soap *soap, struct ns1__executeCommand *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_instantiate_ns1__executeCommand(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommand(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommand, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct ns1__executeCommand;
-        if (size)
-            *size = sizeof(struct ns1__executeCommand);
-    }
-    else
-    {   cp->ptr = (void*)new struct ns1__executeCommand[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct ns1__executeCommand);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct ns1__executeCommand*)cp->ptr;
+	if ((p = soap_in_ns1__executeCommand(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__executeCommand(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommand(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommand, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommand);
+		if (size)
+			*size = sizeof(struct ns1__executeCommand);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommand[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct ns1__executeCommand);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct ns1__executeCommand*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommand(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns1__executeCommand %p -> %p\n", q, p));
-    *(struct ns1__executeCommand*)p = *(struct ns1__executeCommand*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns1__executeCommand %p -> %p\n", q, p));
+	*(struct ns1__executeCommand*)p = *(struct ns1__executeCommand*)q;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_ns1__executeCommandResponse(struct soap *soap, struct ns1__executeCommandResponse *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    a->result = NULL;
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	a->result = NULL;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_ns1__executeCommandResponse(struct soap *soap, const struct ns1__executeCommandResponse *a)
 {
-    (void)soap; (void)a; /* appease -Wall -Werror */
-    soap_serialize_PointerTostring(soap, &a->result);
+	(void)soap; (void)a; /* appease -Wall -Werror */
+	soap_serialize_PointerTostring(soap, &a->result);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommandResponse(struct soap *soap, const struct ns1__executeCommandResponse *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap *soap, const char *tag, int id, const struct ns1__executeCommandResponse *a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommandResponse);
-    if (soap_out_ns1__executeCommandResponse(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommandResponse), type))
+		return soap->error;
+	if (soap_out_PointerTostring(soap, "result", -1, &a->result, ""))
+		return soap->error;
+	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ns1__executeCommandResponse(struct soap *soap, const char *tag, int id, const struct ns1__executeCommandResponse *a, const char *type)
+SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_in_ns1__executeCommandResponse(struct soap *soap, const char *tag, struct ns1__executeCommandResponse *a, const char *type)
 {
-    if (soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ns1__executeCommandResponse), type))
-        return soap->error;
-    if (soap_out_PointerTostring(soap, "result", -1, &a->result, ""))
-        return soap->error;
-    return soap_element_end_out(soap, tag);
+	size_t soap_flag_result = 1;
+	if (soap_element_begin_in(soap, tag, 0, type))
+		return NULL;
+	a = (struct ns1__executeCommandResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommandResponse, sizeof(struct ns1__executeCommandResponse), 0, NULL, NULL, NULL);
+	if (!a)
+		return NULL;
+	soap_default_ns1__executeCommandResponse(soap, a);
+	if (soap->body && !*soap->href)
+	{
+		for (;;)
+		{	soap->error = SOAP_TAG_MISMATCH;
+			if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTostring(soap, "result", &a->result, "xsd:string"))
+				{	soap_flag_result--;
+					continue;
+				}
+			if (soap->error == SOAP_TAG_MISMATCH)
+				soap->error = soap_ignore_element(soap);
+			if (soap->error == SOAP_NO_TAG)
+				break;
+			if (soap->error)
+				return NULL;
+		}
+		if (soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	else
+	{	a = (struct ns1__executeCommandResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommandResponse, 0, sizeof(struct ns1__executeCommandResponse), 0, NULL);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_get_ns1__executeCommandResponse(struct soap *soap, struct ns1__executeCommandResponse *p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommandResponse(struct soap *soap, const struct ns1__executeCommandResponse *a, const char *tag, const char *type)
 {
-    if ((p = soap_in_ns1__executeCommandResponse(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ns1__executeCommandResponse);
+	if (soap_out_ns1__executeCommandResponse(soap, tag?tag:"ns1:executeCommandResponse", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_in_ns1__executeCommandResponse(struct soap *soap, const char *tag, struct ns1__executeCommandResponse *a, const char *type)
+SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_get_ns1__executeCommandResponse(struct soap *soap, struct ns1__executeCommandResponse *p, const char *tag, const char *type)
 {
-    short soap_flag_result = 1;
-    if (soap_element_begin_in(soap, tag, 0, type))
-        return NULL;
-    a = (struct ns1__executeCommandResponse *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ns1__executeCommandResponse, sizeof(struct ns1__executeCommandResponse), 0, NULL, NULL, NULL);
-    if (!a)
-        return NULL;
-    soap_default_ns1__executeCommandResponse(soap, a);
-    if (soap->body && !*soap->href)
-    {
-        for (;;)
-        {   soap->error = SOAP_TAG_MISMATCH;
-            if (soap_flag_result && soap->error == SOAP_TAG_MISMATCH)
-                if (soap_in_PointerTostring(soap, "result", &a->result, "xsd:string"))
-                {   soap_flag_result--;
-                    continue;
-                }
-            if (soap->error == SOAP_TAG_MISMATCH)
-                soap->error = soap_ignore_element(soap);
-            if (soap->error == SOAP_NO_TAG)
-                break;
-            if (soap->error)
-                return NULL;
-        }
-        if (soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    else
-    {   a = (struct ns1__executeCommandResponse *)soap_id_forward(soap, soap->href, (void*)a, 0, SOAP_TYPE_ns1__executeCommandResponse, 0, sizeof(struct ns1__executeCommandResponse), 0, NULL);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
-}
-
-SOAP_FMAC5 struct ns1__executeCommandResponse * SOAP_FMAC6 soap_new_ns1__executeCommandResponse(struct soap *soap, int n)
-{   return soap_instantiate_ns1__executeCommandResponse(soap, n, NULL, NULL, NULL);
-}
-
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ns1__executeCommandResponse(struct soap *soap, struct ns1__executeCommandResponse *p)
-{   soap_delete(soap, p);
-}
-
-SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_instantiate_ns1__executeCommandResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
-{
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommandResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-    struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommandResponse, n, soap_fdelete);
-    if (!cp)
-        return NULL;
-    if (n < 0)
-    {   cp->ptr = (void*)new struct ns1__executeCommandResponse;
-        if (size)
-            *size = sizeof(struct ns1__executeCommandResponse);
-    }
-    else
-    {   cp->ptr = (void*)new struct ns1__executeCommandResponse[n];
-        if (!cp->ptr)
-        {   soap->error = SOAP_EOM;
-            return NULL;
-        }
-        if (size)
-            *size = n * sizeof(struct ns1__executeCommandResponse);
-    }
-        DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-    return (struct ns1__executeCommandResponse*)cp->ptr;
+	if ((p = soap_in_ns1__executeCommandResponse(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
+}
+
+SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1__executeCommandResponse(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+{
+	(void)type; (void)arrayType; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ns1__executeCommandResponse(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ns1__executeCommandResponse, n, soap_fdelete);
+	if (!cp)
+		return NULL;
+	if (n < 0)
+	{	cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommandResponse);
+		if (size)
+			*size = sizeof(struct ns1__executeCommandResponse);
+	}
+	else
+	{	cp->ptr = (void*)SOAP_NEW(struct ns1__executeCommandResponse[n]);
+		if (!cp->ptr)
+		{	soap->error = SOAP_EOM;
+			return NULL;
+		}
+		if (size)
+			*size = n * sizeof(struct ns1__executeCommandResponse);
+	}
+		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
+	return (struct ns1__executeCommandResponse*)cp->ptr;
 }
+
 SOAP_FMAC3 void SOAP_FMAC4 soap_copy_ns1__executeCommandResponse(struct soap *soap, int st, int tt, void *p, size_t len, const void *q, size_t n)
 {
-    DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns1__executeCommandResponse %p -> %p\n", q, p));
-    *(struct ns1__executeCommandResponse*)p = *(struct ns1__executeCommandResponse*)q;
+	(void)soap; (void)st; (void)len; (void)n; /* appease -Wall -Werror */
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying struct ns1__executeCommandResponse %p -> %p\n", q, p));
+	*(struct ns1__executeCommandResponse*)p = *(struct ns1__executeCommandResponse*)q;
 }
 
 #ifndef WITH_NOGLOBAL
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *const*a)
 {
-    if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Reason))
-        soap_serialize_SOAP_ENV__Reason(soap, *a);
+	if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Reason))
+		soap_serialize_SOAP_ENV__Reason(soap, *a);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Reason(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Reason *const*a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Reason);
-    if (soap_out_PointerToSOAP_ENV__Reason(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Reason);
+	if (id < 0)
+		return soap->error;
+	return soap_out_SOAP_ENV__Reason(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Reason(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Reason *const*a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reason(struct soap *soap, const char *tag, struct SOAP_ENV__Reason **a, const char *type)
 {
-    id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Reason);
-    if (id < 0)
-        return soap->error;
-    return soap_out_SOAP_ENV__Reason(soap, tag, id, *a, type);
+	if (soap_element_begin_in(soap, tag, 1, NULL))
+		return NULL;
+	if (!a)
+		if (!(a = (struct SOAP_ENV__Reason **)soap_malloc(soap, sizeof(struct SOAP_ENV__Reason *))))
+			return NULL;
+	*a = NULL;
+	if (!soap->null && *soap->href != '#')
+	{	soap_revert(soap);
+		if (!(*a = soap_in_SOAP_ENV__Reason(soap, tag, *a, type)))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Reason **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason **p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason *const*a, const char *tag, const char *type)
 {
-    if ((p = soap_in_PointerToSOAP_ENV__Reason(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Reason);
+	if (soap_out_PointerToSOAP_ENV__Reason(soap, tag?tag:"SOAP-ENV:Reason", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reason(struct soap *soap, const char *tag, struct SOAP_ENV__Reason **a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Reason(struct soap *soap, struct SOAP_ENV__Reason **p, const char *tag, const char *type)
 {
-    if (soap_element_begin_in(soap, tag, 1, NULL))
-        return NULL;
-    if (!a)
-        if (!(a = (struct SOAP_ENV__Reason **)soap_malloc(soap, sizeof(struct SOAP_ENV__Reason *))))
-            return NULL;
-    *a = NULL;
-    if (!soap->null && *soap->href != '#')
-    {   soap_revert(soap);
-        if (!(*a = soap_in_SOAP_ENV__Reason(soap, tag, *a, type)))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Reason **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Reason, sizeof(struct SOAP_ENV__Reason), 0);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
+	if ((p = soap_in_PointerToSOAP_ENV__Reason(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 #endif
@@ -1410,53 +1406,53 @@ SOAP_FMAC3 struct SOAP_ENV__Reason ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Reas
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *const*a)
 {
-    if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Detail))
-        soap_serialize_SOAP_ENV__Detail(soap, *a);
+	if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Detail))
+		soap_serialize_SOAP_ENV__Detail(soap, *a);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Detail(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Detail *const*a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Detail);
-    if (soap_out_PointerToSOAP_ENV__Detail(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Detail);
+	if (id < 0)
+		return soap->error;
+	return soap_out_SOAP_ENV__Detail(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Detail(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Detail *const*a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail **a, const char *type)
 {
-    id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Detail);
-    if (id < 0)
-        return soap->error;
-    return soap_out_SOAP_ENV__Detail(soap, tag, id, *a, type);
+	if (soap_element_begin_in(soap, tag, 1, NULL))
+		return NULL;
+	if (!a)
+		if (!(a = (struct SOAP_ENV__Detail **)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail *))))
+			return NULL;
+	*a = NULL;
+	if (!soap->null && *soap->href != '#')
+	{	soap_revert(soap);
+		if (!(*a = soap_in_SOAP_ENV__Detail(soap, tag, *a, type)))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Detail **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail **p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail *const*a, const char *tag, const char *type)
 {
-    if ((p = soap_in_PointerToSOAP_ENV__Detail(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Detail);
+	if (soap_out_PointerToSOAP_ENV__Detail(soap, tag?tag:"SOAP-ENV:Detail", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Detail(struct soap *soap, const char *tag, struct SOAP_ENV__Detail **a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Detail(struct soap *soap, struct SOAP_ENV__Detail **p, const char *tag, const char *type)
 {
-    if (soap_element_begin_in(soap, tag, 1, NULL))
-        return NULL;
-    if (!a)
-        if (!(a = (struct SOAP_ENV__Detail **)soap_malloc(soap, sizeof(struct SOAP_ENV__Detail *))))
-            return NULL;
-    *a = NULL;
-    if (!soap->null && *soap->href != '#')
-    {   soap_revert(soap);
-        if (!(*a = soap_in_SOAP_ENV__Detail(soap, tag, *a, type)))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Detail **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Detail, sizeof(struct SOAP_ENV__Detail), 0);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
+	if ((p = soap_in_PointerToSOAP_ENV__Detail(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 #endif
@@ -1465,181 +1461,180 @@ SOAP_FMAC3 struct SOAP_ENV__Detail ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Deta
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *const*a)
 {
-    if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Code))
-        soap_serialize_SOAP_ENV__Code(soap, *a);
+	if (!soap_reference(soap, *a, SOAP_TYPE_SOAP_ENV__Code))
+		soap_serialize_SOAP_ENV__Code(soap, *a);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Code(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Code *const*a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Code);
-    if (soap_out_PointerToSOAP_ENV__Code(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Code);
+	if (id < 0)
+		return soap->error;
+	return soap_out_SOAP_ENV__Code(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerToSOAP_ENV__Code(struct soap *soap, const char *tag, int id, struct SOAP_ENV__Code *const*a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(struct soap *soap, const char *tag, struct SOAP_ENV__Code **a, const char *type)
 {
-    id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_SOAP_ENV__Code);
-    if (id < 0)
-        return soap->error;
-    return soap_out_SOAP_ENV__Code(soap, tag, id, *a, type);
+	if (soap_element_begin_in(soap, tag, 1, NULL))
+		return NULL;
+	if (!a)
+		if (!(a = (struct SOAP_ENV__Code **)soap_malloc(soap, sizeof(struct SOAP_ENV__Code *))))
+			return NULL;
+	*a = NULL;
+	if (!soap->null && *soap->href != '#')
+	{	soap_revert(soap);
+		if (!(*a = soap_in_SOAP_ENV__Code(soap, tag, *a, type)))
+			return NULL;
+	}
+	else
+	{	a = (struct SOAP_ENV__Code **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code **p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code *const*a, const char *tag, const char *type)
 {
-    if ((p = soap_in_PointerToSOAP_ENV__Code(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerToSOAP_ENV__Code);
+	if (soap_out_PointerToSOAP_ENV__Code(soap, tag?tag:"SOAP-ENV:Code", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_in_PointerToSOAP_ENV__Code(struct soap *soap, const char *tag, struct SOAP_ENV__Code **a, const char *type)
+SOAP_FMAC3 struct SOAP_ENV__Code ** SOAP_FMAC4 soap_get_PointerToSOAP_ENV__Code(struct soap *soap, struct SOAP_ENV__Code **p, const char *tag, const char *type)
 {
-    if (soap_element_begin_in(soap, tag, 1, NULL))
-        return NULL;
-    if (!a)
-        if (!(a = (struct SOAP_ENV__Code **)soap_malloc(soap, sizeof(struct SOAP_ENV__Code *))))
-            return NULL;
-    *a = NULL;
-    if (!soap->null && *soap->href != '#')
-    {   soap_revert(soap);
-        if (!(*a = soap_in_SOAP_ENV__Code(soap, tag, *a, type)))
-            return NULL;
-    }
-    else
-    {   a = (struct SOAP_ENV__Code **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_SOAP_ENV__Code, sizeof(struct SOAP_ENV__Code), 0);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
+	if ((p = soap_in_PointerToSOAP_ENV__Code(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 #endif
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTostring(struct soap *soap, char **const*a)
 {
-    if (!soap_reference(soap, *a, SOAP_TYPE_string))
-        soap_serialize_string(soap, *a);
+	if (!soap_reference(soap, *a, SOAP_TYPE_string))
+		soap_serialize_string(soap, *a);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTostring(struct soap *soap, char **const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTostring(struct soap *soap, const char *tag, int id, char **const*a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTostring);
-    if (soap_out_PointerTostring(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_string);
+	if (id < 0)
+		return soap->error;
+	return soap_out_string(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTostring(struct soap *soap, const char *tag, int id, char **const*a, const char *type)
+SOAP_FMAC3 char *** SOAP_FMAC4 soap_in_PointerTostring(struct soap *soap, const char *tag, char ***a, const char *type)
 {
-    id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_string);
-    if (id < 0)
-        return soap->error;
-    return soap_out_string(soap, tag, id, *a, type);
+	if (soap_element_begin_in(soap, tag, 1, NULL))
+		return NULL;
+	if (!a)
+		if (!(a = (char ***)soap_malloc(soap, sizeof(char **))))
+			return NULL;
+	*a = NULL;
+	if (!soap->null && *soap->href != '#')
+	{	soap_revert(soap);
+		if (!(*a = soap_in_string(soap, tag, *a, type)))
+			return NULL;
+	}
+	else
+	{	a = (char ***)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_string, sizeof(char *), 1);
+		if (soap->body && soap_element_end_in(soap, tag))
+			return NULL;
+	}
+	return a;
 }
 
-SOAP_FMAC3 char *** SOAP_FMAC4 soap_get_PointerTostring(struct soap *soap, char ***p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTostring(struct soap *soap, char **const*a, const char *tag, const char *type)
 {
-    if ((p = soap_in_PointerTostring(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTostring);
+	if (soap_out_PointerTostring(soap, tag?tag:"byte", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 char *** SOAP_FMAC4 soap_in_PointerTostring(struct soap *soap, const char *tag, char ***a, const char *type)
+SOAP_FMAC3 char *** SOAP_FMAC4 soap_get_PointerTostring(struct soap *soap, char ***p, const char *tag, const char *type)
 {
-    if (soap_element_begin_in(soap, tag, 1, NULL))
-        return NULL;
-    if (!a)
-        if (!(a = (char ***)soap_malloc(soap, sizeof(char **))))
-            return NULL;
-    *a = NULL;
-    if (!soap->null && *soap->href != '#')
-    {   soap_revert(soap);
-        if (!(*a = soap_in_string(soap, tag, *a, type)))
-            return NULL;
-    }
-    else
-    {   a = (char ***)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_string, sizeof(char *), 1);
-        if (soap->body && soap_element_end_in(soap, tag))
-            return NULL;
-    }
-    return a;
+	if ((p = soap_in_PointerTostring(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default__QName(struct soap *soap, char **a)
-{   soap_default_string(soap, a);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
+{
+	return soap_outstring(soap, tag, id, a, type, SOAP_TYPE__QName);
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize__QName(struct soap *soap, char *const*a)
-{   soap_serialize_string(soap, a);
+SOAP_FMAC3 char * * SOAP_FMAC4 soap_in__QName(struct soap *soap, const char *tag, char **a, const char *type)
+{	char **p;
+	p = soap_instring(soap, tag, a, type, SOAP_TYPE__QName, 2, -1, -1);
+	return p;
 }
 
 SOAP_FMAC3 int SOAP_FMAC4 soap_put__QName(struct soap *soap, char *const*a, const char *tag, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE__QName);
-    if (soap_out__QName(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
-}
-
-SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
-{
-    return soap_outstring(soap, tag, id, a, type, SOAP_TYPE__QName);
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE__QName);
+	if (soap_out__QName(soap, tag?tag:"byte", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
 SOAP_FMAC3 char ** SOAP_FMAC4 soap_get__QName(struct soap *soap, char **p, const char *tag, const char *type)
 {
-    if ((p = soap_in__QName(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
-}
-
-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);
+	if ((p = soap_in__QName(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_default_string(struct soap *soap, char **a)
-{   (void)soap; /* appease -Wall -Werror */
+{
+	(void)soap; /* appease -Wall -Werror */
 #ifdef SOAP_DEFAULT_string
-    *a = SOAP_DEFAULT_string;
+	*a = SOAP_DEFAULT_string;
 #else
-    *a = (char *)0;
+	*a = (char *)0;
 #endif
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_string(struct soap *soap, char *const*a)
 {
-    soap_reference(soap, *a, SOAP_TYPE_string);
+	soap_reference(soap, *a, SOAP_TYPE_string);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap *soap, char *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_string(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
 {
-    register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_string);
-    if (soap_out_string(soap, tag, id, a, type))
-        return soap->error;
-    return soap_putindependent(soap);
+	return soap_outstring(soap, tag, id, a, type, SOAP_TYPE_string);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_string(struct soap *soap, const char *tag, int id, char *const*a, const char *type)
-{
-    return soap_outstring(soap, tag, id, a, type, SOAP_TYPE_string);
+SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type)
+{	char **p;
+	p = soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+	return p;
 }
 
-SOAP_FMAC3 char ** SOAP_FMAC4 soap_get_string(struct soap *soap, char **p, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_string(struct soap *soap, char *const*a, const char *tag, const char *type)
 {
-    if ((p = soap_in_string(soap, tag, p, type)))
-        if (soap_getindependent(soap))
-            return NULL;
-    return p;
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_string);
+	if (soap_out_string(soap, tag?tag:"byte", id, a, type))
+		return soap->error;
+	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 char * * SOAP_FMAC4 soap_in_string(struct soap *soap, const char *tag, char **a, const char *type)
+SOAP_FMAC3 char ** SOAP_FMAC4 soap_get_string(struct soap *soap, char **p, const char *tag, const char *type)
 {
-    return soap_instring(soap, tag, a, type, SOAP_TYPE_string, 1, -1, -1);
+	if ((p = soap_in_string(soap, tag, p, type)))
+		if (soap_getindependent(soap))
+			return NULL;
+	return p;
 }
 
-/* End of soapC.cpp */
+#if defined(__BORLANDC__)
+#pragma option pop
+#pragma option pop
+#endif
 
+/* End of soapC.cpp */