axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r525082 [2/4] - in /webservices/axis2/trunk/c: axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ guththila/src/ modules/core/addr/ modules/core/clientapi/ modules/...
Date Tue, 03 Apr 2007 08:25:17 GMT
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Tue Apr  3 01:25:12 2007
@@ -1221,11 +1221,11 @@
     ns->name = guththila_token_to_string(environment, 
 										 name, 
 										 parser->unicode_state);
-    ns->length = axis2_strlen(ns->name);
+    ns->length = axutil_strlen(ns->name);
     ns->uri = guththila_token_to_string(environment, 
 										uri, 
 										parser->unicode_state);
-    ns->lengthuri = axis2_strlen(ns->uri);
+    ns->lengthuri = axutil_strlen(ns->uri);
     axutil_stack_push(parser->namesp, environment, ns);
 }
 
@@ -1421,7 +1421,7 @@
 							   guththila_namespace_t * ns)
 {
     if (ns)
-        return axis2_strdup(environment, ns->name);
+        return axutil_strdup(environment, ns->name);
     else
         return NULL;
 }
@@ -1435,7 +1435,7 @@
 							guththila_namespace_t * ns)
 {
     if (ns)
-        return axis2_strdup(environment, ns->uri);
+        return axutil_strdup(environment, ns->uri);
     else
         return NULL;
 }
@@ -1454,7 +1454,7 @@
     {
         ns = (guththila_namespace_t *) axutil_stack_get_at(parser->namesp, environment, ix - i);
     }
-    return axis2_strdup(environment, ns->name);
+    return axutil_strdup(environment, ns->name);
 }
 
 
@@ -1472,7 +1472,7 @@
     {
         ns = (guththila_namespace_t *) axutil_stack_get_at(parser->namesp, environment, ix - i);
     }
-    return axis2_strdup(environment, ns->uri);
+    return axutil_strdup(environment, ns->uri);
 }
 
 
@@ -1497,9 +1497,9 @@
             if (ns && att_prefix)
             {
                 if (!
-					(axis2_strcmp
+					(axutil_strcmp
 					 (ns->name, att_prefix)))
-                    return axis2_strdup(environment, ns->uri);
+                    return axutil_strdup(environment, ns->uri);
             }
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Tue Apr  3 01:25:12 2007
@@ -66,7 +66,7 @@
 
     if (address)
     {
-        endpoint_ref->address = axis2_strdup(env, address);
+        endpoint_ref->address = axutil_strdup(env, address);
         if (!(endpoint_ref->address))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -96,7 +96,7 @@
         AXIS2_FREE(env->allocator, endpoint_ref->address);
     }
 
-    endpoint_ref->address = axis2_strdup(env, address);
+    endpoint_ref->address = axutil_strdup(env, address);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Tue Apr  3 01:25:12 2007
@@ -86,7 +86,7 @@
 
     if (action)
     {
-        msg_info_headers->action = axis2_strdup(env, action);
+        msg_info_headers->action = axutil_strdup(env, action);
         if (!(msg_info_headers->action))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -200,7 +200,7 @@
     }
     if (action)
 	{
-        msg_info_headers->action = axis2_strdup(env, action);
+        msg_info_headers->action = axutil_strdup(env, action);
 	}
     return AXIS2_SUCCESS;
 }
@@ -227,7 +227,7 @@
 
     if (message_id)
     {
-        msg_info_headers->message_id = axis2_strdup(env, message_id);
+        msg_info_headers->message_id = axutil_strdup(env, message_id);
         if (!(msg_info_headers->message_id))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/addr/relates_to.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/relates_to.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/relates_to.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/relates_to.c Tue Apr  3 01:25:12 2007
@@ -47,7 +47,7 @@
 
     if (value)
     {
-        relates_to->value = axis2_strdup(env, value);
+        relates_to->value = axutil_strdup(env, value);
         if (!(relates_to->value))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -58,7 +58,7 @@
 
     if (relationship_type)
     {
-        relates_to->relationship_type = axis2_strdup(env, relationship_type);
+        relates_to->relationship_type = axutil_strdup(env, relationship_type);
         if (!(relates_to->relationship_type))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -91,7 +91,7 @@
 
     if (value)
     {
-        relates_to->value = (axis2_char_t *)axis2_strdup(env, value);
+        relates_to->value = (axis2_char_t *)axutil_strdup(env, value);
         if (!(relates_to->value))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -124,7 +124,7 @@
     if (relationship_type)
     {
         relates_to->relationship_type =
-            (axis2_char_t *)axis2_strdup(env, relationship_type);
+            (axis2_char_t *)axutil_strdup(env, relationship_type);
         if (!(relates_to->relationship_type))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/addr/svc_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/svc_name.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/svc_name.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/svc_name.c Tue Apr  3 01:25:12 2007
@@ -60,7 +60,7 @@
 
     if (endpoint_name)
     {
-        svc_name->endpoint_name = axis2_strdup(env, endpoint_name);
+        svc_name->endpoint_name = axutil_strdup(env, endpoint_name);
         if (!(svc_name->endpoint_name))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -122,7 +122,7 @@
 
     if (endpoint_name)
     {
-        svc_name->endpoint_name = axis2_strdup(env, endpoint_name);
+        svc_name->endpoint_name = axutil_strdup(env, endpoint_name);
         if (!(svc_name->endpoint_name))
             return AXIS2_FAILURE;
     }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Tue Apr  3 01:25:12 2007
@@ -142,7 +142,7 @@
 
     if (msg_id)
     {
-        axis2_char_t *mid = axis2_strdup(env, msg_id);
+        axis2_char_t *mid = axutil_strdup(env, msg_id);
         axutil_hash_set(callback_recv->callback_map,
                 mid, AXIS2_HASH_KEY_STRING, callback);
     }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Tue Apr  3 01:25:12 2007
@@ -131,10 +131,10 @@
     }
     else
     {
-        op_client->mep = axis2_strdup(env, mep_uri);
+        op_client->mep = axutil_strdup(env, mep_uri);
     }
 
-    op_client->soap_version_uri = axis2_strdup(env, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI);
+    op_client->soap_version_uri = axutil_strdup(env, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI);
     if (!(op_client->soap_version_uri))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -226,7 +226,7 @@
             }
 	}
 		
-        if(axis2_strcmp(dump_value, AXIS2_VALUE_TRUE))
+        if(axutil_strcmp(dump_value, AXIS2_VALUE_TRUE))
         {
             axis2_msg_ctx_free(out_msg_ctx, env);
             out_msg_ctx = NULL;
@@ -438,8 +438,8 @@
             if(!response_mc)
             {
                 const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
-                if(axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
-                    axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+                if(axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+                    axutil_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
                 {
                     if(env->error)
 		    {
@@ -658,7 +658,7 @@
     /* make sure operation's MEP is the same as given MEP */
     if (op_client->mep)
     {
-        if (axis2_strcmp(op_client->mep, axis2_op_get_msg_exchange_pattern(op, env)) != 0)
+        if (axutil_strcmp(op_client->mep, axis2_op_get_msg_exchange_pattern(op, env)) != 0)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT, AXIS2_FAILURE);
             return AXIS2_FAILURE;
@@ -729,7 +729,7 @@
 
     if (op_client->soap_version_uri)
     {
-        if (axis2_strcmp(op_client->soap_version_uri,
+        if (axutil_strcmp(op_client->soap_version_uri,
                 AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
             soap_version = AXIOM_SOAP11;
         else
@@ -786,11 +786,11 @@
         axis2_transport_out_desc_t *transport_out_desc = NULL;
 		AXIS2_TRANSPORT_ENUMS transport_enum = 0;
         
-		if (!axis2_strcmp(transport, "http"))
+		if (!axutil_strcmp(transport, "http"))
 		{
 			transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
 		}
-		else if (!axis2_strcmp (transport, "https"))
+		else if (!axutil_strcmp (transport, "https"))
 		{
 			transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
 		}
@@ -824,12 +824,12 @@
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    if (axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, op_client->soap_version_uri) == 0)
+    if (axutil_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, op_client->soap_version_uri) == 0)
     {
         envelope = axiom_soap_envelope_create_with_soap_version_prefix(env, AXIOM_SOAP12, NULL);
     }
 
-    if (axis2_strcmp(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, op_client->soap_version_uri) == 0)
+    if (axutil_strcmp(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, op_client->soap_version_uri) == 0)
     {
         envelope = axiom_soap_envelope_create_with_soap_version_prefix(env, AXIOM_SOAP11, NULL);
     }
@@ -883,7 +883,7 @@
 
     if (soap_version_uri)
     {
-        op_client->soap_version_uri = axis2_strdup(env, soap_version_uri);
+        op_client->soap_version_uri = axutil_strdup(env, soap_version_uri);
         if (!(op_client->soap_version_uri))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -937,7 +937,7 @@
 
     if (wsa_action)
     {
-        op_client->wsa_action = axis2_strdup(env, wsa_action);
+        op_client->wsa_action = axutil_strdup(env, wsa_action);
         if (!(op_client->wsa_action))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1036,8 +1036,8 @@
     {
         /* handle one way case */
         const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
-        if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
-            axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+        if (axutil_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+            axutil_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
         {
             return NULL;
         }
@@ -1110,7 +1110,7 @@
             if(property)
             {
                 axis2_char_t *value = axutil_property_get_value(property, env);
-                if(0 == axis2_strcmp(AXIS2_VALUE_TRUE, value))
+                if(0 == axutil_strcmp(AXIS2_VALUE_TRUE, value))
                 {
                     return response;
                 }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Tue Apr  3 01:25:12 2007
@@ -571,7 +571,7 @@
 
     if (soap_version_uri)
     {
-        options->soap_version_uri = axis2_strdup(env, soap_version_uri);
+        options->soap_version_uri = axutil_strdup(env, soap_version_uri);
     }
 
     return AXIS2_SUCCESS;
@@ -774,7 +774,7 @@
         if (property)
         {
             axutil_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
-            axutil_property_set_value(property, env, axis2_strdup(env, AXIS2_VALUE_TRUE));
+            axutil_property_set_value(property, env, axutil_strdup(env, AXIS2_VALUE_TRUE));
             axis2_options_set_property(options, env, AXIS2_ENABLE_MTOM, property);
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Apr  3 01:25:12 2007
@@ -152,7 +152,7 @@
 
     svc_client->conf =  axis2_conf_ctx_get_conf(svc_client->conf_ctx, env);
     repos_path =  axis2_conf_get_repo(svc_client->conf, env);
-    wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
+    wsdl_path = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
 
     svc_client->options = axis2_options_create(env);
     /* TODO: this method should be moved out of core implementation
@@ -1188,7 +1188,7 @@
         return AXIS2_FALSE;
     }
 
-    if (axis2_strcmp(soap_version_uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+    if (axutil_strcmp(soap_version_uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
     {
         soap_version = AXIOM_SOAP11;
     }

Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Tue Apr  3 01:25:12 2007
@@ -293,7 +293,7 @@
 
     if (path)
     {
-        conf_ctx->root_dir = axis2_strdup(env, path);
+        conf_ctx->root_dir = axutil_strdup(env, path);
         if (!(conf_ctx->root_dir))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Tue Apr  3 01:25:12 2007
@@ -1006,7 +1006,7 @@
 
     if (svc_ctx_id)
     {
-        msg_ctx->svc_ctx_id = axis2_strdup(env, svc_ctx_id);
+        msg_ctx->svc_ctx_id = axutil_strdup(env, svc_ctx_id);
         if (!(msg_ctx->svc_ctx_id))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1580,7 +1580,7 @@
 		value = (axis2_char_t *)axutil_property_get_value(rest_val, env);
 		if (value)
 		{
-			if (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0)
+			if (axutil_strcmp(value, AXIS2_VALUE_TRUE) == 0)
 				 axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
 		}
     }

Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Tue Apr  3 01:25:12 2007
@@ -190,7 +190,7 @@
 
     if (id)
     {
-        svc_grp_ctx->id = axis2_strdup(env, id);
+        svc_grp_ctx->id = axutil_strdup(env, id);
     }
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Tue Apr  3 01:25:12 2007
@@ -106,7 +106,7 @@
         return NULL;
     }
     arch_file_data->type = type;
-    arch_file_data->name = axis2_strdup(env, name);
+    arch_file_data->name = axutil_strdup(env, name);
     return arch_file_data;
 }
 
@@ -188,7 +188,7 @@
         AXIS2_FREE(env->allocator, arch_file_data->msg_recv);
         arch_file_data->msg_recv = NULL;
     }
-    arch_file_data->msg_recv = axis2_strdup(env, msg_recv);
+    arch_file_data->msg_recv = axutil_strdup(env, msg_recv);
     return AXIS2_SUCCESS;
 }
 
@@ -265,7 +265,7 @@
         AXIS2_FREE(env->allocator, arch_file_data->module_name);
         arch_file_data->module_name = NULL;
     }
-    arch_file_data->module_name = axis2_strdup(env, module_name);
+    arch_file_data->module_name = axutil_strdup(env, module_name);
     return AXIS2_SUCCESS;
 }
 
@@ -289,7 +289,7 @@
         AXIS2_FREE(env->allocator, arch_file_data->module_dll_name);
         arch_file_data->module_dll_name = NULL;
     }
-    arch_file_data->module_dll_name = axis2_strdup(env, module_dll_name);
+    arch_file_data->module_dll_name = axutil_strdup(env, module_dll_name);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Tue Apr  3 01:25:12 2007
@@ -91,7 +91,7 @@
 
     repos_path = axis2_dep_engine_get_repos_path(dep_engine, env);
 
-    svcs_xml = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
+    svcs_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
         AXIS2_SERVICE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
         AXIS2_PATH_SEP_STR, AXIS2_SVC_XML, NULL);
 
@@ -163,7 +163,7 @@
         }
     }
 
-    if (root_element_name && 0 == axis2_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
+    if (root_element_name && 0 == axutil_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
     {
         axis2_svc_t *svc = NULL;
         axis2_svc_builder_t *svc_builder = NULL;
@@ -214,7 +214,7 @@
 
     }
     else if (root_element_name &&
-        0 == axis2_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
+        0 == axutil_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
     {
         axis2_svc_grp_builder_t *grp_builder = NULL;
         grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
@@ -242,7 +242,7 @@
     AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
 
     repos_path = axis2_dep_engine_get_repos_path(dep_engine, env);
-    module_xml = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
+    module_xml = axutil_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
         AXIS2_MODULE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
         AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML, NULL);
     if (!module_xml)

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Tue Apr  3 01:25:12 2007
@@ -279,7 +279,7 @@
         if (value)
         {
             axis2_conf_set_enable_mtom(conf_builder->conf, env, 
-                (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0));
+                (axutil_strcmp(value, AXIS2_VALUE_TRUE) == 0));
         }
     }
     
@@ -508,19 +508,19 @@
             }
             return AXIS2_SUCCESS;
         }
-        if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FLOW_START, flow_type))
+        if (flow_type && 0 == axutil_strcmp(AXIS2_IN_FLOW_START, flow_type))
         {
             axis2_phases_info_set_in_phases(info, env, phase_list);
         }
-        else if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
+        else if (flow_type && 0 == axutil_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
         {
             axis2_phases_info_set_in_faultphases(info, env, phase_list);
         }
-        else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FLOW_START, flow_type))
+        else if (flow_type && 0 == axutil_strcmp(AXIS2_OUT_FLOW_START, flow_type))
         {
             axis2_phases_info_set_out_phases(info, env, phase_list);
         }
-        else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
+        else if (flow_type && 0 == axutil_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
         {
             axis2_phases_info_set_out_faultphases(info, env, phase_list);
         }
@@ -675,23 +675,23 @@
             name = axiom_attribute_get_value(trs_name, env);
             if (name)
             {
-                if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+                if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
                 }
@@ -734,10 +734,10 @@
             repos_name = axis2_dep_engine_get_repos_path(
                 axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
                 env);
-            temp_path = axis2_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
-            temp_path2 = axis2_stracat(env, temp_path, AXIS2_LIB_FOLDER);
-            temp_path3 = axis2_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
-            path_qualified_dll_name = axis2_stracat(env, temp_path3, dll_name);
+            temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
+            temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER);
+            temp_path3 = axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
+            path_qualified_dll_name = axutil_stracat(env, temp_path3, dll_name);
             AXIS2_FREE(env->allocator, temp_path);
             AXIS2_FREE(env->allocator, temp_path2);
             AXIS2_FREE(env->allocator, temp_path3);
@@ -928,23 +928,23 @@
             name = axiom_attribute_get_value(trs_name, env);
             if (name)
             {
-                if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
+                if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_XMPP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_SMTP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_SMTP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_TCP) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
                 }
-                else if (axis2_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
+                else if (axutil_strcmp(name, AXIS2_TRANSPORT_HTTPS) == 0)
                 {
                     transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
                 }
@@ -991,10 +991,10 @@
                 repos_name = axis2_dep_engine_get_repos_path(
                     axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
                     env);
-                temp_path = axis2_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
-                temp_path2 = axis2_stracat(env, temp_path, AXIS2_LIB_FOLDER);
-                temp_path3 = axis2_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
-                path_qualified_dll_name = axis2_stracat(env, temp_path3, dll_name);
+                temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
+                temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER);
+                temp_path3 = axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
+                path_qualified_dll_name = axutil_stracat(env, temp_path3, dll_name);
                 AXIS2_FREE(env->allocator, temp_path);
                 AXIS2_FREE(env->allocator, temp_path2);
                 AXIS2_FREE(env->allocator, temp_path3);

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Apr  3 01:25:12 2007
@@ -212,7 +212,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, repos_path, NULL);
     AXIS2_PARAM_CHECK(env->error, svr_xml_file, NULL);
-    if (0 == axis2_strcmp("", repos_path))
+    if (0 == axutil_strcmp("", repos_path))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPO_CAN_NOT_BE_NULL,
             AXIS2_FAILURE);
@@ -236,7 +236,7 @@
         return NULL;
     }
 
-    dep_engine->folder_name = axis2_strdup(env, repos_path);
+    dep_engine->folder_name = axutil_strdup(env, repos_path);
     if (! dep_engine->folder_name)
     {
         axis2_dep_engine_free(dep_engine, env);
@@ -244,7 +244,7 @@
         return NULL;
     }
 
-    dep_engine->axis2_repos = axis2_strdup(env, repos_path);
+    dep_engine->axis2_repos = axutil_strdup(env, repos_path);
     if (!dep_engine->axis2_repos)
     {
         axis2_dep_engine_free(dep_engine, env);
@@ -252,8 +252,8 @@
         return NULL;
     }
 
-    conf_file_l = axis2_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
-    dep_engine->conf_name = axis2_stracat(env, conf_file_l, svr_xml_file);
+    conf_file_l = axutil_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
+    dep_engine->conf_name = axutil_stracat(env, conf_file_l, svr_xml_file);
     AXIS2_FREE(env->allocator, conf_file_l);
     if (!dep_engine->conf_name)
     {
@@ -553,7 +553,7 @@
     if (para_hot_dep)
     {
         value = (axis2_char_t *) axutil_param_get_value(para_hot_dep, env);
-        if (0 == axis2_strcasecmp("false", value))
+        if (0 == axutil_strcasecmp("false", value))
         {
             dep_engine->hot_dep = AXIS2_FALSE;
         }
@@ -561,7 +561,7 @@
     if (para_hot_update)
     {
         value = (axis2_char_t *) axutil_param_get_value(para_hot_update, env);
-        if (0 == axis2_strcasecmp("false", value))
+        if (0 == axutil_strcasecmp("false", value))
         {
             dep_engine->hot_update = AXIS2_FALSE;
         }
@@ -690,13 +690,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, client_home, NULL);
 
-    dep_engine->axis2_repos = axis2_strdup(env, client_home);
+    dep_engine->axis2_repos = axutil_strdup(env, client_home);
     if (!dep_engine->axis2_repos)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    if (client_home && 0 != axis2_strcmp("", client_home))
+    if (client_home && 0 != axutil_strcmp("", client_home))
     {
         status = axis2_dep_engine_check_client_home(dep_engine, env, client_home);
         if (AXIS2_SUCCESS == status)
@@ -706,7 +706,7 @@
     }
     else
     {
-        dep_engine->conf_name = axis2_strdup(env, AXIS2_CONFIGURATION_RESOURCE);
+        dep_engine->conf_name = axutil_strdup(env, AXIS2_CONFIGURATION_RESOURCE);
         if (!dep_engine->conf_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -775,18 +775,18 @@
     axis2_char_t *path_l = NULL;
     axis2_status_t status = AXIS2_FAILURE;
 
-    dep_engine->folder_name = axis2_strdup(env, client_home);
+    dep_engine->folder_name = axutil_strdup(env, client_home);
     if (!dep_engine->folder_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return AXIS2_FAILURE;
     }
-    path_l = axis2_stracat(env, client_home, AXIS2_PATH_SEP_STR);
-    dep_engine->conf_name = axis2_stracat(env, path_l, AXIS2_SERVER_XML_FILE);
+    path_l = axutil_stracat(env, client_home, AXIS2_PATH_SEP_STR);
+    dep_engine->conf_name = axutil_stracat(env, path_l, AXIS2_SERVER_XML_FILE);
     AXIS2_FREE(env->allocator, path_l);
     if (!dep_engine->conf_name)
     {
-        dep_engine->conf_name = axis2_strdup(env, AXIS2_CONFIGURATION_RESOURCE);
+        dep_engine->conf_name = axutil_strdup(env, AXIS2_CONFIGURATION_RESOURCE);
         if (!dep_engine->conf_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CONFIG_NOT_FOUND,
@@ -860,10 +860,10 @@
         phase2 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 2);
         phase3 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 3);
     }
-    if ((phase0 && 0 != axis2_strcmp(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
-        (phase1 && 0 != axis2_strcmp(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
-        (phase2 && 0 != axis2_strcmp(phase2, AXIS2_PHASE_DISPATCH)) ||
-        (phase3 && 0 != axis2_strcmp(phase3, AXIS2_PHASE_POST_DISPATCH)))
+    if ((phase0 && 0 != axutil_strcmp(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
+        (phase1 && 0 != axutil_strcmp(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
+        (phase2 && 0 != axutil_strcmp(phase2, AXIS2_PHASE_DISPATCH)) ||
+        (phase3 && 0 != axutil_strcmp(phase3, AXIS2_PHASE_POST_DISPATCH)))
     {
         AXIS2_ERROR_SET(env->error, AXI2_ERROR_INVALID_PHASE, AXIS2_FAILURE);
         return AXIS2_SUCCESS;
@@ -1046,8 +1046,8 @@
     timestamp =  axutil_file_get_timestamp(module_folder, env);
     axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
     module_folder_path =  axutil_file_get_path(module_folder, env);
-    temp_path = axis2_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
-    dll_path = axis2_stracat(env, temp_path, dll_name);
+    temp_path = axutil_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
+    dll_path = axutil_stracat(env, temp_path, dll_name);
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
         "axis2_dep_engine_load_module_dll; dll path is : %s", dll_path);
     status =  axutil_dll_desc_set_name(dll_desc, env, dll_path);
@@ -1357,7 +1357,7 @@
     axis2_char_t *svc_name = NULL;
     int len = 0;
 
-    file_name_l = axis2_strdup(env, file_name);
+    file_name_l = axutil_strdup(env, file_name);
     ptr = AXIS2_STRRCHR(file_name_l, AXIS2_PATH_SEP_CHAR);
 
     temp_name = ptr + 1;

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Tue Apr  3 01:25:12 2007
@@ -80,7 +80,7 @@
         return NULL;
     }
 
-    desc_builder->file_name = axis2_strdup(env, file_name);
+    desc_builder->file_name = axutil_strdup(env, file_name);
     if (!desc_builder->file_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -383,7 +383,7 @@
             name = axutil_qname_get_localpart(qname, env);
 
             value = axiom_attribute_get_value(order_attrib, env);
-            if (0 == axis2_strcmp(AXIS2_AFTER, name))
+            if (0 == axutil_strcmp(AXIS2_AFTER, name))
             {
                 struct axis2_phase_rule *phase_rule = NULL;
 
@@ -395,7 +395,7 @@
                     return NULL;
                 }
             }
-            if (0 == axis2_strcmp(AXIS2_BEFORE, name))
+            if (0 == axutil_strcmp(AXIS2_BEFORE, name))
             {
                 struct axis2_phase_rule *phase_rule = NULL;
                 phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -406,7 +406,7 @@
                     return NULL;
                 }
             }
-            if (0 == axis2_strcmp(AXIS2_PHASE, name))
+            if (0 == axutil_strcmp(AXIS2_PHASE, name))
             {
                 struct axis2_phase_rule *phase_rule = NULL;
                 phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -417,13 +417,13 @@
                     return NULL;
                 }
             }
-            if (0 == axis2_strcmp(AXIS2_PHASEFIRST, name))
+            if (0 == axutil_strcmp(AXIS2_PHASEFIRST, name))
             {
                 axis2_char_t *bool_val = NULL;
 
                 bool_val = axis2_desc_builder_get_value(desc_builder, env,
                     value);
-                if (0 == axis2_strcmp(bool_val, "true"))
+                if (0 == axutil_strcmp(bool_val, "true"))
                 {
                     struct axis2_phase_rule *phase_rule = NULL;
                     phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -436,7 +436,7 @@
                         return NULL;
                     }
                 }
-                else if (0 == axis2_strcmp(bool_val, "false"))
+                else if (0 == axutil_strcmp(bool_val, "false"))
                 {
                     struct axis2_phase_rule *phase_rule = NULL;
                     phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -569,7 +569,7 @@
 
         temp = axiom_element_get_text(
             param_element, env, param_node);
-        para_test_value = axis2_strdup(env, temp);
+        para_test_value = axutil_strdup(env, temp);
         status = axutil_param_set_value(param, env, para_test_value);
         if (AXIS2_SUCCESS != status)
         {
@@ -638,10 +638,10 @@
         mapping_element = axiom_node_get_data_element(mapping_node, env);
         temp_str = axiom_element_get_text(mapping_element, env, 
             mapping_node);
-        input_action_string = axis2_strtrim(env, temp_str, NULL);
+        input_action_string = axutil_strtrim(env, temp_str, NULL);
         AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Input action mapping found %s", 
             input_action_string);
-        if(0 != axis2_strcmp("", input_action_string))
+        if(0 != axutil_strcmp("", input_action_string))
         {
             axutil_array_list_add(mapping_list, env, input_action_string);
         }
@@ -736,7 +736,7 @@
         {
             axis2_char_t *locked_value = NULL;
             locked_value = axiom_attribute_get_value(para_locked, env);
-            if (0 == axis2_strcmp("true", locked_value))
+            if (0 == axutil_strcmp("true", locked_value))
             {
                 axis2_char_t *param_name = NULL;
                 axis2_bool_t is_param_locked = AXIS2_FALSE;
@@ -894,10 +894,10 @@
              axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
                  class_name);
         repos_name = axis2_dep_engine_get_repos_path(desc_builder->engine, env);
-        temp_path = axis2_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
-        temp_path2 = axis2_stracat(env, temp_path, AXIS2_LIB_FOLDER);
-        temp_path3 = axis2_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
-        dll_name = axis2_stracat(env, temp_path3, msg_recv_dll_name);
+        temp_path = axutil_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
+        temp_path2 = axutil_stracat(env, temp_path, AXIS2_LIB_FOLDER);
+        temp_path3 = axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
+        dll_name = axutil_stracat(env, temp_path3, msg_recv_dll_name);
         AXIS2_FREE(env->allocator, temp_path);
         AXIS2_FREE(env->allocator, temp_path2);
         AXIS2_FREE(env->allocator, temp_path3);
@@ -941,7 +941,7 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, file_name, NULL);
 
-    file_name_l = axis2_strdup(env, file_name);
+    file_name_l = axutil_strdup(env, file_name);
     if (!file_name_l)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -949,7 +949,7 @@
     }
     separator = ".";
 
-    value = axis2_strstr(file_name_l, separator);
+    value = axutil_strstr(file_name_l, separator);
 
     value[0] = AXIS2_EOLN;
     short_name = file_name_l;
@@ -967,13 +967,13 @@
     int len = 0;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, short_file_name, NULL);
-    file_name_l = axis2_strdup(env, short_file_name);
+    file_name_l = axutil_strdup(env, short_file_name);
     if (!file_name_l)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    len = axis2_strlen(AXIS2_LIB_PREFIX);
+    len = axutil_strlen(AXIS2_LIB_PREFIX);
     short_name = &file_name_l[len];
     return short_name;
 
@@ -991,13 +991,13 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, in, NULL);
 
-    in_l = axis2_strdup(env, in);
+    in_l = axutil_strdup(env, in);
     if (!in_l)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    value = axis2_strstr(in_l, separator);
+    value = axutil_strstr(in_l, separator);
     value = value + 1;
 
     return value;

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Tue Apr  3 01:25:12 2007
@@ -171,7 +171,7 @@
 
 
         class_name = axiom_attribute_get_value(module_dll_att, env);
-        if (class_name && (0 != axis2_strcmp("", class_name)))
+        if (class_name && (0 != axutil_strcmp("", class_name)))
         {
             axis2_dep_engine_t *dep_engine = 
                 axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Tue Apr  3 01:25:12 2007
@@ -290,10 +290,10 @@
     {
         phase_name = (axis2_char_t *) 
             axutil_array_list_get(phases_info->in_phases, env, i);
-        if (0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
-            0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
-            0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name) ||
-            0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name))
+        if (0 == axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
+            0 == axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
+            0 == axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name) ||
+            0 == axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name))
         {
             /* Do nothing */
         }

Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Tue Apr  3 01:25:12 2007
@@ -86,7 +86,7 @@
     {
         return NULL;
     }
-    repos_listener->folder_name = axis2_strdup(env, folder_name);
+    repos_listener->folder_name = axutil_strdup(env, folder_name);
     if (!repos_listener->folder_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -140,8 +140,8 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    temp_path = axis2_stracat(env, repos_listener->folder_name, AXIS2_PATH_SEP_STR);
-    module_path = axis2_stracat(env, temp_path, AXIS2_MODULE_PATH);
+    temp_path = axutil_stracat(env, repos_listener->folder_name, AXIS2_PATH_SEP_STR);
+    module_path = axutil_stracat(env, temp_path, AXIS2_MODULE_PATH);
     AXIS2_FREE(env->allocator, temp_path);
     status = axis2_repos_listener_search(repos_listener, env, module_path, AXIS2_MODULE);
     AXIS2_FREE(env->allocator, module_path);
@@ -158,8 +158,8 @@
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    temp_path = axis2_stracat(env, repos_listener->folder_name, AXIS2_PATH_SEP_STR);
-    svc_path = axis2_stracat(env, temp_path, AXIS2_SVC_PATH);
+    temp_path = axutil_stracat(env, repos_listener->folder_name, AXIS2_PATH_SEP_STR);
+    svc_path = axutil_stracat(env, temp_path, AXIS2_SVC_PATH);
     AXIS2_FREE(env->allocator, temp_path);
     status = axis2_repos_listener_search(repos_listener, env, svc_path, AXIS2_SVC);
     AXIS2_FREE(env->allocator, svc_path);

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Tue Apr  3 01:25:12 2007
@@ -281,7 +281,7 @@
     timestamp =  axutil_file_get_timestamp(svc_folder, env);
     axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
     svc_folder_path =  axutil_file_get_path(svc_folder, env);
-    dll_path = axis2_strcat(env, svc_folder_path, AXIS2_PATH_SEP_STR,
+    dll_path = axutil_strcat(env, svc_folder_path, AXIS2_PATH_SEP_STR,
         svc_dll_name, NULL);
     AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
     status =  axutil_dll_desc_set_name(dll_desc, env, dll_path);
@@ -369,7 +369,7 @@
 
             param = axutil_array_list_get(params, env, j);
             param_name = axutil_param_get_name(param, env);
-            if (0 == axis2_strcmp(param_name, AXIS2_WSA_MAPPING))
+            if (0 == axutil_strcmp(param_name, AXIS2_WSA_MAPPING))
             {
                 axis2_char_t *key = NULL;
 

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info.c Tue Apr  3 01:25:12 2007
@@ -51,7 +51,7 @@
     ws_info->last_modified_date = 0;
     ws_info->type = 0;
 
-    ws_info->file_name = axis2_strdup(env, file_name);
+    ws_info->file_name = axutil_strdup(env, file_name);
     if (!ws_info->file_name)
     {
         axis2_ws_info_free(ws_info, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Tue Apr  3 01:25:12 2007
@@ -168,7 +168,7 @@
     AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
 
     temp_name =  axutil_file_get_name(file, env);
-    info_list_name = axis2_strdup(env, temp_name);
+    info_list_name = axutil_strdup(env, temp_name);
     if (!info_list_name)
     {
         return AXIS2_FAILURE;
@@ -267,7 +267,7 @@
             ws_info_list, env, i);
 
         file_name_l = axis2_ws_info_get_file_name(ws_info, env);
-        if (0 == axis2_strcmp(file_name_l, file_name))
+        if (0 == axutil_strcmp(file_name_l, file_name))
         {
             return ws_info;
         }
@@ -341,7 +341,7 @@
             axis2_char_t *file_name = NULL;
             file_name = (axis2_char_t *) axutil_array_list_get(ws_info_list->
                 current_info_lists, env, j);
-            if (0 == axis2_strcmp(file_name, file_item_name))
+            if (0 == axutil_strcmp(file_name, file_item_name))
             {
                 exist = AXIS2_TRUE;
                 break;

Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Tue Apr  3 01:25:12 2007
@@ -244,7 +244,7 @@
 
     if (class_name)
     {
-        handler_desc->class_name = axis2_strdup(env, class_name);
+        handler_desc->class_name = axutil_strdup(env, class_name);
         if (!handler_desc->class_name)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Tue Apr  3 01:25:12 2007
@@ -254,7 +254,7 @@
 
     if (direction)
     {
-        msg->direction = axis2_strdup(env, direction);
+        msg->direction = axutil_strdup(env, direction);
         if (!(msg->direction))
         {
             return AXIS2_FAILURE;
@@ -318,7 +318,7 @@
 
     if (name)
     {
-        msg->name = axis2_strdup(env, name);
+        msg->name = axutil_strdup(env, name);
         if (!(msg->name))
         {
             return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Tue Apr  3 01:25:12 2007
@@ -70,7 +70,7 @@
     op->qname = NULL;
     op->msg_exchange_pattern = NULL;
     op->style = NULL;
-    op->style = axis2_strdup(env, AXIS2_STYLE_DOC);
+    op->style = axutil_strdup(env, AXIS2_STYLE_DOC);
 
     op->param_container = (axutil_param_container_t *)
             axutil_param_container_create(env);
@@ -432,7 +432,7 @@
         op->msg_exchange_pattern = NULL;
     }
 
-    op->msg_exchange_pattern = axis2_strdup(env, pattern);
+    op->msg_exchange_pattern = axutil_strdup(env, pattern);
     return AXIS2_SUCCESS;
 }
 
@@ -464,7 +464,7 @@
         op->style = NULL;
     }
 
-    op->style = axis2_strdup(env, style);
+    op->style = axutil_strdup(env, style);
     return AXIS2_SUCCESS;
 }
 
@@ -643,42 +643,42 @@
 
     temp = AXIS2_MEP_CONSTANT_INVALID;
 
-    if (axis2_strcmp(AXIS2_MEP_URI_IN_OUT,
+    if (axutil_strcmp(AXIS2_MEP_URI_IN_OUT,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_IN_OUT;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_IN_ONLY,
+    else if (axutil_strcmp(AXIS2_MEP_URI_IN_ONLY,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_IN_ONLY;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_IN_OPTIONAL_OUT,
+    else if (axutil_strcmp(AXIS2_MEP_URI_IN_OPTIONAL_OUT,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_IN_OPTIONAL_OUT;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_OUT_IN,
+    else if (axutil_strcmp(AXIS2_MEP_URI_OUT_IN,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_OUT_IN;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_OUT_ONLY,
+    else if (axutil_strcmp(AXIS2_MEP_URI_OUT_ONLY,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_OUT_ONLY;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_OUT_OPTIONAL_IN,
+    else if (axutil_strcmp(AXIS2_MEP_URI_OUT_OPTIONAL_IN,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_OUT_OPTIONAL_IN;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_ROBUST_IN_ONLY,
+    else if (axutil_strcmp(AXIS2_MEP_URI_ROBUST_IN_ONLY,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_ROBUST_IN_ONLY;
     }
-    else if (axis2_strcmp(AXIS2_MEP_URI_ROBUST_OUT_ONLY,
+    else if (axutil_strcmp(AXIS2_MEP_URI_ROBUST_OUT_ONLY,
         axis2_op_get_msg_exchange_pattern(op, env)) == 0)
     {
         temp = AXIS2_MEP_CONSTANT_ROBUST_OUT_ONLY;

Modified: webservices/axis2/trunk/c/modules/core/description/phase_rule.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/phase_rule.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Tue Apr  3 01:25:12 2007
@@ -59,7 +59,7 @@
 
     if (name)
     {
-        phase_rule->name = axis2_strdup(env, name);
+        phase_rule->name = axutil_strdup(env, name);
     }
 
     return phase_rule;
@@ -86,7 +86,7 @@
 
     if (before)
     {
-        phase_rule->before = axis2_strdup(env, before);
+        phase_rule->before = axutil_strdup(env, before);
         if (!phase_rule->before)
         {
             AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -119,7 +119,7 @@
 
     if (after)
     {
-        phase_rule->after = axis2_strdup(env, after);
+        phase_rule->after = axutil_strdup(env, after);
         if (!phase_rule->after)
         {
             AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
@@ -152,7 +152,7 @@
 
     if (name)
     {
-        phase_rule->name = axis2_strdup(env, name);
+        phase_rule->name = axutil_strdup(env, name);
         if (!phase_rule->name)
         {
             AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);

Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Tue Apr  3 01:25:12 2007
@@ -200,21 +200,21 @@
         AXIS2_FREE(env->allocator, svc->schema_target_ns_prefix);
         svc->schema_target_ns_prefix = NULL;
     }
-    svc->schema_target_ns_prefix = axis2_strdup(env, "ns");
+    svc->schema_target_ns_prefix = axutil_strdup(env, "ns");
 
     if (svc->target_ns)
     {
         AXIS2_FREE(env->allocator, svc->target_ns);
         svc->target_ns = NULL;
     }
-    svc->target_ns = axis2_strdup(env, "http://ws.apache.org/axis2");
+    svc->target_ns = axutil_strdup(env, "http://ws.apache.org/axis2");
 
     if (svc->target_ns_prefix)
     {
         AXIS2_FREE(env->allocator, svc->target_ns_prefix);
         svc->target_ns_prefix = NULL;
     }
-    svc->target_ns_prefix = axis2_strdup(env, "tns");
+    svc->target_ns_prefix = axutil_strdup(env, "tns");
     svc->sc_calc_count = 0;
 
     return svc;
@@ -793,7 +793,7 @@
         AXIS2_FREE(env->allocator, svc->axis_svc_name);
         svc->axis_svc_name = NULL;
     }
-    svc->axis_svc_name = axis2_strdup(env, axis_svc_name);
+    svc->axis_svc_name = axutil_strdup(env, axis_svc_name);
     if (!svc->axis_svc_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -837,7 +837,7 @@
         AXIS2_FREE(env->allocator, svc->filename);
         svc->filename = NULL;
     }
-    svc->filename = (axis2_char_t *) axis2_strdup(env, filename);
+    svc->filename = (axis2_char_t *) axutil_strdup(env, filename);
     if (!svc->filename)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -866,7 +866,7 @@
         AXIS2_FREE(env->allocator, svc->svc_desc);
         svc->svc_desc = NULL;
     }
-    svc->svc_desc = (axis2_char_t *) axis2_strdup(env, svc_desc);
+    svc->svc_desc = (axis2_char_t *) axutil_strdup(env, svc_desc);
     if (!svc->svc_desc)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -885,7 +885,7 @@
     AXIS2_PARAM_CHECK(env->error, mapping_key, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
 
-    axutil_hash_set(svc->op_action_map, axis2_strdup(env, mapping_key),
+    axutil_hash_set(svc->op_action_map, axutil_strdup(env, mapping_key),
             AXIS2_HASH_KEY_STRING, op_desc);
     return AXIS2_SUCCESS;
 }
@@ -935,7 +935,7 @@
         AXIS2_FREE(env->allocator, svc->target_ns);
         svc->target_ns = NULL;
     }
-    svc->target_ns = axis2_strdup(env, ns);
+    svc->target_ns = axutil_strdup(env, ns);
     return AXIS2_SUCCESS;
 }
 
@@ -960,7 +960,7 @@
         AXIS2_FREE(env->allocator, svc->target_ns_prefix);
         svc->target_ns_prefix = NULL;
     }
-    svc->target_ns_prefix = axis2_strdup(env, prefix);
+    svc->target_ns_prefix = axutil_strdup(env, prefix);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Tue Apr  3 01:25:12 2007
@@ -160,7 +160,7 @@
 
     if (svc_grp->svc_grp_name)
         AXIS2_FREE(env->allocator, svc_grp->svc_grp_name);
-    svc_grp->svc_grp_name = axis2_strdup(env, name);
+    svc_grp->svc_grp_name = axutil_strdup(env, name);
     if (!svc_grp->svc_grp_name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -443,7 +443,7 @@
         modu = axutil_array_list_get(svc_grp->module_qnames, env, i);
         modu_local = axutil_qname_get_localpart(modu, env);
         module_name_local = axutil_qname_get_localpart(module_name, env);
-        if (0 == axis2_strcmp(modu_local, module_name_local))
+        if (0 == axutil_strcmp(modu_local, module_name_local))
         {
             AXIS2_ERROR_SET(env->error,
                     AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC_GRP, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Tue Apr  3 01:25:12 2007
@@ -107,8 +107,8 @@
             AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
                     "Checking for service using WSA enpoint address : %s", address);
 
-            if ((axis2_strcmp(AXIS2_WSA_ANONYMOUS_URL, address) == 0) ||
-                    (axis2_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, address) == 0))
+            if ((axutil_strcmp(AXIS2_WSA_ANONYMOUS_URL, address) == 0) ||
+                    (axutil_strcmp(AXIS2_WSA_NAMESPACE_SUBMISSION, address) == 0))
             {
                 AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, 
                     "Endpoint address cannot be the same as WSA namespace : %s", address);
@@ -203,7 +203,7 @@
     {
         const axis2_char_t *relates_to_value = NULL;
         relates_to_value = axis2_relates_to_get_value(relates_to, env);
-        if (relates_to_value && axis2_strcmp(relates_to_value, "") != 0)
+        if (relates_to_value && axutil_strcmp(relates_to_value, "") != 0)
         {
             axis2_conf_ctx_t *conf_ctx = NULL;
 

Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Tue Apr  3 01:25:12 2007
@@ -1315,10 +1315,10 @@
         file = (axutil_file_t *) axis2_arch_reader_create_module_arch(
                     arch_reader, env, file_name) ;
         repos_path =  axis2_conf_get_repo(conf, env);
-        temp_path1 = axis2_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
-        temp_path2 = axis2_stracat(env, temp_path1, AXIS2_MODULE_FOLDER);
-        temp_path3 = axis2_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
-        path = axis2_stracat(env, temp_path3, file_name);
+        temp_path1 = axutil_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
+        temp_path2 = axutil_stracat(env, temp_path1, AXIS2_MODULE_FOLDER);
+        temp_path3 = axutil_stracat(env, temp_path2, AXIS2_PATH_SEP_STR);
+        path = axutil_stracat(env, temp_path3, file_name);
         AXIS2_FREE(env->allocator, temp_path1);
         AXIS2_FREE(env->allocator, temp_path2);
         AXIS2_FREE(env->allocator, temp_path3);
@@ -1408,7 +1408,7 @@
         AXIS2_FREE(env->allocator, conf->axis2_repo);
         conf->axis2_repo = NULL;
     }
-    conf->axis2_repo = axis2_strdup(env, repos_path);
+    conf->axis2_repo = axutil_strdup(env, repos_path);
     return AXIS2_SUCCESS;
 }
 
@@ -1461,13 +1461,13 @@
 
     if (!mod_ver)
     {
-        mod_name = axis2_strdup(env, module_name);
+        mod_name = axutil_strdup(env, module_name);
     }
     else
     {
         axis2_char_t *tmp_name = NULL;
-        tmp_name = axis2_stracat(env, module_name, "-");
-        mod_name = axis2_stracat(env, tmp_name, mod_ver);
+        tmp_name = axutil_stracat(env, module_name, "-");
+        mod_name = axutil_stracat(env, tmp_name, mod_ver);
         AXIS2_FREE(env->allocator, tmp_name);
     }
     mod_qname = axutil_qname_create(env, mod_name, NULL, NULL);
@@ -1507,7 +1507,7 @@
     if (!axutil_hash_get(name_to_ver_map, module_name,
             AXIS2_HASH_KEY_STRING))
     {
-        axis2_char_t *new_entry = axis2_strdup(env, module_version);
+        axis2_char_t *new_entry = axutil_strdup(env, module_version);
         if (! new_entry)
         {
             return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Apr  3 01:25:12 2007
@@ -446,8 +446,8 @@
         {
             fault_to = NULL;
         }
-        else if (axis2_strcmp(AXIS2_WSA_NONE_URL, address) == 0 ||
-                axis2_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, address) == 0)
+        else if (axutil_strcmp(AXIS2_WSA_NONE_URL, address) == 0 ||
+                axutil_strcmp(AXIS2_WSA_NONE_URL_SUBMISSION, address) == 0)
         {
             reply_to =  axis2_msg_ctx_get_reply_to(processing_context, env);
             if (reply_to)
@@ -614,7 +614,7 @@
             axis2_msg_ctx_get_paused_phase_name(msg_ctx, env);
         /* skip invoking handlers until we find the paused phase */
         if (phase_name && paused_phase_name && 0 == 
-            axis2_strcmp(phase_name, paused_phase_name))
+            axutil_strcmp(phase_name, paused_phase_name))
         {
             int paused_handler_i = -1;
             found_match = AXIS2_TRUE;
@@ -647,7 +647,7 @@
     const axutil_env_t *env,
     const axis2_char_t *soap_namespace)
 {
-    if (axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_namespace))
+    if (axutil_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, soap_namespace))
         return AXIOM_SOAP12_FAULT_CODE_RECEIVER;
     else
         return AXIOM_SOAP11_FAULT_CODE_RECEIVER;
@@ -707,7 +707,7 @@
             if ( axis2_msg_ctx_get_is_soap_11(msg_ctx, env) != AXIS2_TRUE)
             {
                 /* SOAP 1.2 */
-                if (!role || axis2_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NEXT) != 0)
+                if (!role || axutil_strcmp(role, AXIOM_SOAP12_SOAP_ROLE_NEXT) != 0)
                 {
                     axiom_soap_envelope_t *temp_env =
                         axiom_soap_envelope_create_default_soap_fault_envelope(env,
@@ -723,7 +723,7 @@
             else
             {
                 /* SOAP 1.1 */
-                if (!role || axis2_strcmp(role, AXIOM_SOAP11_SOAP_ACTOR_NEXT) != 0)
+                if (!role || axutil_strcmp(role, AXIOM_SOAP11_SOAP_ACTOR_NEXT) != 0)
                 {
                     axiom_soap_envelope_t *temp_env =
                         axiom_soap_envelope_create_default_soap_fault_envelope(env,

Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Tue Apr  3 01:25:12 2007
@@ -89,7 +89,7 @@
 
     if (phase_name)
     {
-        phase->name = axis2_strdup(env, phase_name);
+        phase->name = axutil_strdup(env, phase_name);
         if (!(phase->name))
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -278,7 +278,7 @@
 
     if (before && after)
     {
-        if (axis2_strcmp(before, after) == 0)
+        if (axutil_strcmp(before, after) == 0)
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_BEFORE_AFTER_HANDLERS_SAME, AXIS2_FAILURE);
             return AXIS2_FAILURE;
@@ -473,7 +473,7 @@
         if (!before)
             return AXIS2_TRUE;
 
-        if (axis2_strcmp(first_handler_name, before) == 0)
+        if (axutil_strcmp(first_handler_name, before) == 0)
             return AXIS2_FALSE;
         else
             return AXIS2_TRUE;
@@ -517,7 +517,7 @@
         if (!after)
             return AXIS2_TRUE;
 
-        if (axis2_strcmp(last_handler_name, after) == 0)
+        if (axutil_strcmp(last_handler_name, after) == 0)
             return AXIS2_FALSE;
         else
             return AXIS2_TRUE;
@@ -577,7 +577,7 @@
             return AXIS2_FAILURE;
         }
 
-        if (axis2_strcmp(before, handler_name) == 0)
+        if (axutil_strcmp(before, handler_name) == 0)
         {
             /*return axutil_array_list_add(phase->handlers, env, handler);*/
             return axis2_phase_add_unique(env, phase->handlers, handler);
@@ -605,7 +605,7 @@
                 return AXIS2_FAILURE;
             }
 
-            if (axis2_strcmp(before, handler_name) == 0)
+            if (axutil_strcmp(before, handler_name) == 0)
             {
                 return axutil_array_list_add_at(phase->handlers, env, i, handler);
             }
@@ -668,7 +668,7 @@
             return AXIS2_FAILURE;
         }
 
-        if (axis2_strcmp(after, handler_name) == 0)
+        if (axutil_strcmp(after, handler_name) == 0)
         {
             return axutil_array_list_add_at(phase->handlers, env, 0, handler);
         }
@@ -695,7 +695,7 @@
                 return AXIS2_FAILURE;
             }
 
-            if (axis2_strcmp(after, handler_name) == 0)
+            if (axutil_strcmp(after, handler_name) == 0)
             {
                 if (i == (size - 1))
                 {
@@ -796,8 +796,8 @@
 
     if (before_handler_name && after_handler_name)
     {
-        if (axis2_strcmp(before_handler_name, before_name) == 0 &&
-                axis2_strcmp(after_handler_name, after_name) == 0)
+        if (axutil_strcmp(before_handler_name, before_name) == 0 &&
+                axutil_strcmp(after_handler_name, after_name) == 0)
         {
             return axis2_phase_add_unique(env, phase->handlers, handler);
         }
@@ -805,7 +805,7 @@
 
     if (after_handler_name)
     {
-        if (axis2_strcmp(after_handler_name, after_name) == 0)
+        if (axutil_strcmp(after_handler_name, after_name) == 0)
             after = 0;
     }
 
@@ -813,7 +813,7 @@
 
     if (after_handler_name)
     {
-        if (axis2_strcmp(before_handler_name, before_name) == 0)
+        if (axutil_strcmp(before_handler_name, before_name) == 0)
             before = size;
     }
 
@@ -836,9 +836,9 @@
                 return AXIS2_FAILURE;
             }
 
-            if (axis2_strcmp(handler_name, after_name) == 0)
+            if (axutil_strcmp(handler_name, after_name) == 0)
                 after = i;
-            if (axis2_strcmp(handler_name, before_name) == 0)
+            if (axutil_strcmp(handler_name, before_name) == 0)
                 before = i;
         }
 
@@ -1030,7 +1030,7 @@
             add_handler = AXIS2_FALSE;
             break;
         }
-        else if (0 == axis2_strcmp(axutil_string_get_buffer(handler_name, env), 
+        else if (0 == axutil_strcmp(axutil_string_get_buffer(handler_name, env), 
                             axutil_string_get_buffer(obj_name, env)))
         {
             add_handler = AXIS2_FALSE;
@@ -1066,7 +1066,7 @@
             remove_handler = AXIS2_TRUE;
             break;
         }
-        else if (!axis2_strcmp(axutil_string_get_buffer(handler_name, env), 
+        else if (!axutil_strcmp(axutil_string_get_buffer(handler_name, env), 
                             axutil_string_get_buffer(obj_name, env)))
         {
             remove_handler = AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Tue Apr  3 01:25:12 2007
@@ -112,7 +112,7 @@
         if (!op)
         {
             const axis2_char_t * op_name = NULL;
-            op_name = axis2_rindex(action, '/');
+            op_name = axutil_rindex(action, '/');
 
             if (op_name)
             {

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Tue Apr  3 01:25:12 2007
@@ -97,7 +97,7 @@
         phase = (axis2_phase_t *) axutil_array_list_get(phase_holder->
             phase_list, env, i);
         phase_name_l =  axis2_phase_get_name(phase, env);
-        if (0 == axis2_strcmp(phase_name_l, phase_name))
+        if (0 == axutil_strcmp(phase_name_l, phase_name))
         {
             return AXIS2_TRUE;
         }
@@ -195,7 +195,7 @@
         phase = (axis2_phase_t *) axutil_array_list_get(phase_holder->
             phase_list, env, i);
         phase_name_l =  axis2_phase_get_name(phase, env);
-        if (0 == axis2_strcmp(phase_name_l, phase_name))
+        if (0 == axutil_strcmp(phase_name_l, phase_name))
         {
             return phase;
         }

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Apr  3 01:25:12 2007
@@ -295,10 +295,10 @@
                 {
                     return AXIS2_FAILURE;
                 }
-                if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 != axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     if (!all_handlers)
                     {
@@ -364,17 +364,17 @@
             }
 
             /* TODO change this in proper way */
-            if (!phase_name || (0 == axis2_strcmp(phase_name, "")))
+            if (!phase_name || (0 == axutil_strcmp(phase_name, "")))
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PHASE_IS_NOT_SPECIFED,
                     AXIS2_FAILURE);
                 return AXIS2_FAILURE;
 
             }
-            else if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
-                (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
-                (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
-                (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+            else if ((0 == axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+                (0 == axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+                (0 == axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+                (0 == axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
             {
                 if (all_handlers)
                 {
@@ -1069,10 +1069,10 @@
                     {
                         return AXIS2_FAILURE;
                     }
-                    if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
-                        (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
-                        (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
-                        (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                    if ((0 != axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+                        (0 != axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+                        (0 != axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+                        (0 != axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                     {
                         if (phase_holder)
                         {
@@ -1213,10 +1213,10 @@
                 {
                     return AXIS2_FAILURE;
                 }
-                if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 == axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     status = axis2_phase_holder_add_handler(phase_holder, env, 
                         metadata);
@@ -1491,10 +1491,10 @@
                 metadata = axis2_flow_get_handler(flow, env, j);
                 phase_rule = axis2_handler_desc_get_rules(metadata, env);
                 phase_name = axis2_phase_rule_get_name(phase_rule, env);
-                if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 != axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     status = axis2_phase_holder_add_handler(phase_holder,
                         env, metadata);
@@ -1507,10 +1507,10 @@
                     }
 
                 }
-                if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 == axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     axutil_array_list_t *phase_list = NULL;
                     axis2_phase_holder_t *phase_holder = NULL;
@@ -1638,10 +1638,10 @@
                 metadata = axis2_flow_get_handler(flow, env, j);
                 phase_rule = axis2_handler_desc_get_rules(metadata, env);
                 phase_name = axis2_phase_rule_get_name(phase_rule, env);
-                if ((0 != axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
-                    (0 != axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 != axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
+                    (0 != axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     status = axis2_phase_holder_remove_handler(phase_holder,
                         env, metadata);
@@ -1654,10 +1654,10 @@
                     }
 
                 }
-                if ((0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
-                    (0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
+                if ((0 == axutil_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
+                    (0 == axutil_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
                 {
                     axutil_array_list_t *phase_list = NULL;
                     axis2_phase_holder_t *phase_holder = NULL;

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Tue Apr  3 01:25:12 2007
@@ -86,7 +86,7 @@
         return NULL;
     }
 
-    msg_recv->scope = axis2_strdup (env, "app*");
+    msg_recv->scope = axutil_strdup (env, "app*");
     msg_recv->derived = NULL;
     msg_recv->receive = axis2_msg_recv_receive_impl;
     return msg_recv;
@@ -196,7 +196,7 @@
     {
         AXIS2_FREE(env->allocator, msg_recv->scope);
     }
-    msg_recv->scope = axis2_strdup(env, scope);
+    msg_recv->scope = axutil_strdup(env, scope);
     if (!msg_recv->scope)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -241,7 +241,7 @@
     {
         param_value = axutil_param_get_value(scope_param, env);
     }
-    if (param_value && (0 == axis2_strcmp(AXIS2_APPLICATION_SCOPE,
+    if (param_value && (0 == axutil_strcmp(AXIS2_APPLICATION_SCOPE,
         param_value)))
     {
         return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Tue Apr  3 01:25:12 2007
@@ -119,7 +119,7 @@
         op_desc = axis2_op_ctx_get_op(op_ctx, env);
 
         style = axis2_op_get_style(op_desc, env);
-        if (0 == axis2_strcmp(AXIS2_STYLE_DOC, style))
+        if (0 == axutil_strcmp(AXIS2_STYLE_DOC, style))
         {
             axiom_soap_envelope_t *envelope = NULL;
             axiom_soap_body_t *body = NULL;
@@ -130,7 +130,7 @@
             om_element = axiom_node_get_data_element(om_node, env);
             om_node = axiom_node_get_first_element(om_node, env);
          }
-        else if (0 == axis2_strcmp(AXIS2_STYLE_RPC, style))
+        else if (0 == axutil_strcmp(AXIS2_STYLE_RPC, style))
         {
             axiom_soap_envelope_t *envelope = NULL;
             axiom_soap_body_t *body = NULL;
@@ -163,7 +163,7 @@
 
                         function_name = (axis2_char_t *) axutil_array_list_get(
                             function_arr, env, i);
-                        if (0 == axis2_strcmp(function_name, local_name))
+                        if (0 == axutil_strcmp(function_name, local_name))
                         {
                             matches = AXIS2_TRUE;
 
@@ -211,12 +211,12 @@
 
         if (result_node)
         {
-            if (0 == axis2_strcmp(style, AXIS2_STYLE_RPC))
+            if (0 == axutil_strcmp(style, AXIS2_STYLE_RPC))
             {
                 axiom_namespace_t *ns = NULL;
                 axis2_char_t *res_name = NULL;
 
-                res_name = axis2_stracat(env, local_name, "Response");
+                res_name = axutil_stracat(env, local_name, "Response");
                 ns = axiom_namespace_create(env, "http://soapenc/", "res");
                 if (!ns)
                 {

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c Tue Apr  3 01:25:12 2007
@@ -47,8 +47,8 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    http_header->name = (axis2_char_t *)axis2_strdup(env, name);
-    http_header->value = (axis2_char_t *)axis2_strdup(env, value);
+    http_header->name = (axis2_char_t *)axutil_strdup(env, name);
+    http_header->value = (axis2_char_t *)axutil_strdup(env, value);
 
     return http_header;
 }
@@ -65,15 +65,15 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_ENV_CHECK(env, NULL);
 
-    tmp_str = axis2_strdup(env, str);
+    tmp_str = axutil_strdup(env, str);
     if (! tmp_str)
     {
         return NULL;
     }
     /* remove trailing \r\n */
-    if ('\r' == tmp_str[axis2_strlen(tmp_str)-2])
+    if ('\r' == tmp_str[axutil_strlen(tmp_str)-2])
     {
-        tmp_str[axis2_strlen(tmp_str)-2] = '\0';
+        tmp_str[axutil_strlen(tmp_str)-2] = '\0';
     }
 
     ch = strchr((const char *)tmp_str, ':');
@@ -125,8 +125,8 @@
     axis2_ssize_t len = 0;
     axis2_char_t *external_form = NULL;
     AXIS2_ENV_CHECK(env, NULL);
-    len = axis2_strlen(http_header->name) +
-            axis2_strlen(http_header->value) + 8;
+    len = axutil_strlen(http_header->name) +
+            axutil_strlen(http_header->value) + 8;
     external_form = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
             len);
     sprintf(external_form, "%s: %s%s", http_header->name,

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c Tue Apr  3 01:25:12 2007
@@ -33,11 +33,11 @@
     AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
     if (http_out_transport_info->encoding)
     {
-        axis2_char_t *charset_pos = axis2_strcasestr(content_type, "charset");
+        axis2_char_t *charset_pos = axutil_strcasestr(content_type, "charset");
         if (!charset_pos)
         {
-            tmp1 = axis2_stracat(env, content_type, ";charset=");
-            tmp2 = axis2_stracat(env, tmp1, http_out_transport_info->encoding);
+            tmp1 = axutil_stracat(env, content_type, ";charset=");
+            tmp2 = axutil_stracat(env, tmp1, http_out_transport_info->encoding);
             axis2_http_simple_response_set_header(http_out_transport_info->response, env,
                     axis2_http_header_create(env, AXIS2_HTTP_HEADER_CONTENT_TYPE,
                             tmp2));
@@ -74,7 +74,7 @@
     {
         AXIS2_FREE(env->allocator, http_out_transport_info->encoding);
     }
-    http_out_transport_info->encoding = axis2_strdup(env, encoding);
+    http_out_transport_info->encoding = axutil_strdup(env, encoding);
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c?view=diff&rev=525082&r1=525081&r2=525082
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c Tue Apr  3 01:25:12 2007
@@ -49,9 +49,9 @@
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
-    request_line->method = (axis2_char_t *)axis2_strdup(env, method);
-    request_line->uri = (axis2_char_t *)axis2_strdup(env, uri);
-    request_line->http_version = (axis2_char_t *)axis2_strdup(env, http_version);
+    request_line->method = (axis2_char_t *)axutil_strdup(env, method);
+    request_line->uri = (axis2_char_t *)axutil_strdup(env, uri);
+    request_line->http_version = (axis2_char_t *)axutil_strdup(env, http_version);
                 
 
     return request_line;
@@ -96,7 +96,7 @@
 
     AXIS2_PARAM_CHECK(env->error, str, NULL);
 
-    tmp = axis2_strstr(str, AXIS2_HTTP_CRLF);
+    tmp = axutil_strstr(str, AXIS2_HTTP_CRLF);
 
 
     if (! tmp)
@@ -184,9 +184,9 @@
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    alloc_len = axis2_strlen(request_line->method) +
-            axis2_strlen(request_line->uri) +
-            axis2_strlen(request_line->http_version) + 6;
+    alloc_len = axutil_strlen(request_line->method) +
+            axutil_strlen(request_line->uri) +
+            axutil_strlen(request_line->http_version) + 6;
     /* 5 = 2 * spaces + '/' +CR + LF + '\0' */
 
     ret = AXIS2_MALLOC(env->allocator,



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message