You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sh...@apache.org on 2009/08/18 13:24:02 UTC

svn commit: r805365 [2/5] - in /webservices/axis2/trunk/c/util/src: ./ platforms/unix/ platforms/windows/

Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Tue Aug 18 11:24:00 2009
@@ -28,32 +28,32 @@
 {
     axutil_env_t *env;
 
-    if (!allocator)
+    if(!allocator)
         return NULL;
 
-    env = (axutil_env_t *) AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
+    env = (axutil_env_t *)AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
-    if (!env)
+    if(!env)
         return NULL;
 
     memset(env, 0, sizeof(axutil_env_t));
 
     env->allocator = allocator;
-    
+
     env->log = axutil_log_create_default(allocator);
     env->log->level = AXIS2_LOG_LEVEL_DEBUG; /* default log level is debug */
     env->log_enabled = AXIS2_TRUE;
 
     /* Create default error struct */
     env->error = axutil_error_create(allocator);
-    if (!env->error)
+    if(!env->error)
     {
         AXIS2_FREE(allocator, env);
         return NULL;
     }
-    
+
     /* Call error init to fill in the axutil_error_messages array.
-       This array holds the error messages with respect to error codes */
+     This array holds the error messages with respect to error codes */
     axutil_error_init();
 
     env->ref = 1;
@@ -68,12 +68,12 @@
     axutil_log_t *log)
 {
     axutil_env_t *env;
-    if (!allocator || !error)
+    if(!allocator || !error)
         return NULL;
 
-    env = (axutil_env_t *) AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
+    env = (axutil_env_t *)AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
-    if (!env)
+    if(!env)
         return NULL;
 
     memset(env, 0, sizeof(axutil_env_t));
@@ -82,7 +82,7 @@
     env->error = error;
     env->log = log;
 
-    if (env->log)
+    if(env->log)
         env->log_enabled = AXIS2_TRUE;
     else
         env->log_enabled = AXIS2_FALSE;
@@ -110,13 +110,12 @@
     axutil_thread_pool_t *pool)
 {
     axutil_env_t *env;
-    if (!allocator || !error || !pool)
+    if(!allocator || !error || !pool)
         return NULL;
 
-    env = (axutil_env_t *)AXIS2_MALLOC(allocator ,sizeof(axutil_env_t));
-	
+    env = (axutil_env_t *)AXIS2_MALLOC(allocator, sizeof(axutil_env_t));
 
-    if (!env)
+    if(!env)
         return NULL;
 
     memset(env, 0, sizeof(axutil_env_t));
@@ -124,10 +123,10 @@
     env->allocator = allocator;
     env->error = error;
     env->log = log;
-    
+
     env->thread_pool = pool;
 
-    if (env->log)
+    if(env->log)
         env->log_enabled = AXIS2_TRUE;
     else
         env->log_enabled = AXIS2_FALSE;
@@ -153,25 +152,24 @@
     allocator = axutil_allocator_init(NULL);
     error = axutil_error_create(allocator);
 
-    if (log_file)
+    if(log_file)
     {
         log = axutil_log_create(allocator, NULL, log_file);
     }
-    
+
     /* if log file name was not given or the log could not be create with 
-       given name, create default log */
-    if (!log)
+     given name, create default log */
+    if(!log)
     {
         log = axutil_log_create_default(allocator);
     }
-    
+
     thread_pool = axutil_thread_pool_init(allocator);
-    
-    env = axutil_env_create_with_error_log_thread_pool(allocator, error, log,
-                                                       thread_pool);
-    if (env->log)
+
+    env = axutil_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
+    if(env->log)
     {
-        if (AXIS2_LOG_LEVEL_CRITICAL <= log_level && log_level <= AXIS2_LOG_LEVEL_TRACE)
+        if(AXIS2_LOG_LEVEL_CRITICAL <= log_level && log_level <= AXIS2_LOG_LEVEL_TRACE)
         {
             env->log->level = log_level;
         }
@@ -190,7 +188,7 @@
 axutil_env_check_status(
     const axutil_env_t *env)
 {
-    if (env && env->error)
+    if(env && env->error)
         return AXIS2_ERROR_GET_STATUS_CODE(env->error);
 
     return AXIS2_CRITICAL_FAILURE;
@@ -201,7 +199,7 @@
     axutil_env_t *env,
     axis2_bool_t enable)
 {
-    if (env)
+    if(env)
     {
         env->log_enabled = enable;
         return AXIS2_SUCCESS;
@@ -216,37 +214,37 @@
 {
     axutil_allocator_t *allocator = NULL;
 
-    if (!env)
+    if(!env)
         return;
 
-    if (--(env->ref) > 0)
+    if(--(env->ref) > 0)
     {
         return;
     }
-    
+
     allocator = env->allocator;
 
-    if (env->log)
+    if(env->log)
     {
         AXIS2_LOG_FREE(env->allocator, env->log);
     }
-    
-    if (env->error)
+
+    if(env->error)
     {
         AXIS2_ERROR_FREE(env->error);
     }
-    
-    if (env->thread_pool)
+
+    if(env->thread_pool)
     {
         axutil_thread_pool_free(env->thread_pool);
     }
-    
-    if (env->allocator)
+
+    if(env->allocator)
     {
         AXIS2_FREE(env->allocator, env);
     }
-    
-    if (allocator)
+
+    if(allocator)
     {
         AXIS2_FREE(allocator, allocator);
     }
@@ -259,36 +257,35 @@
     axutil_env_t *env,
     char mask)
 {
-    if (!env)
+    if(!env)
         return;
 
-    if (--(env->ref) > 0)
+    if(--(env->ref) > 0)
     {
         return;
     }
 
-    if (mask & AXIS_ENV_FREE_LOG)
+    if(mask & AXIS_ENV_FREE_LOG)
     {
         AXIS2_LOG_FREE(env->allocator, env->log);
     }
-    
-    if (mask & AXIS_ENV_FREE_ERROR)
+
+    if(mask & AXIS_ENV_FREE_ERROR)
     {
         AXIS2_ERROR_FREE(env->error);
     }
-    
-    if (mask & AXIS_ENV_FREE_THREADPOOL)
+
+    if(mask & AXIS_ENV_FREE_THREADPOOL)
     {
         axutil_thread_pool_free(env->thread_pool);
     }
-    
-    if (env)
+
+    if(env)
         AXIS2_FREE(env->allocator, env);
 
     return;
 }
 
-
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_env_increment_ref(
     axutil_env_t *env)

Modified: webservices/axis2/trunk/c/util/src/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/error.c (original)
+++ webservices/axis2/trunk/c/util/src/error.c Tue Aug 18 11:24:00 2009
@@ -21,7 +21,6 @@
 
 #define AXIS2_ERROR_MESSAGE_ARRAY_SIZE AXUTIL_ERROR_MAX
 
-
 /**
  * Array to hold error messages corresponding to the pre-defined error codes.
  * Note that array has capacity for additional error messages. These are 
@@ -40,14 +39,13 @@
  *    occupied spaces. 
  */
 
-AXIS2_EXPORT const axis2_char_t*
-axutil_error_messages[AXIS2_ERROR_MESSAGE_ARRAY_SIZE];
+AXIS2_EXPORT const axis2_char_t* axutil_error_messages[AXIS2_ERROR_MESSAGE_ARRAY_SIZE];
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_error_init()
 {
     int i = 0;
-    for (i = 0; i < AXIS2_ERROR_MESSAGE_ARRAY_SIZE ; i++)
+    for(i = 0; i < AXIS2_ERROR_MESSAGE_ARRAY_SIZE; i++)
     {
         axutil_error_messages[i] = "Unknown Error :(";
     }
@@ -55,497 +53,404 @@
     /* Common Errors */
     axutil_error_messages[AXIS2_ERROR_NONE] = "No Error";
     axutil_error_messages[AXIS2_ERROR_NO_MEMORY] = "Out of memory";
-    axutil_error_messages[AXIS2_ERROR_INVALID_NULL_PARAM] =
-        "NULL parameter was passed when a non NULL parameter was expected";
+    axutil_error_messages[AXIS2_ERROR_INVALID_NULL_PARAM]
+        = "NULL parameter was passed when a non NULL parameter was expected";
     /* core:addr */
 
     /* core:clientapi */
-    axutil_error_messages[AXIS2_ERROR_BLOCKING_INVOCATION_EXPECTS_RESPONSE] =
-        "Blocking invocation expects response";
-    axutil_error_messages[AXIS2_ERROR_CANNOT_INFER_TRANSPORT] =
-        "Cannot infer transport from URL";
-    axutil_error_messages[AXIS2_ERROR_CLIENT_SIDE_SUPPORT_ONLY_ONE_CONF_CTX] =
-        "Client side support only one configuration context";
-    axutil_error_messages[AXIS2_ERROR_MEP_CANNOT_BE_NULL_IN_MEP_CLIENT] =
-        "MEP cannot be NULL in MEP client";
-    axutil_error_messages[AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT] =
-        "MEP mismatch";
-    axutil_error_messages[AXIS2_ERROR_TWO_WAY_CHANNEL_NEEDS_ADDRESSING] =
-        "Two way channel needs addressing module to be engaged";
+    axutil_error_messages[AXIS2_ERROR_BLOCKING_INVOCATION_EXPECTS_RESPONSE]
+        = "Blocking invocation expects response";
+    axutil_error_messages[AXIS2_ERROR_CANNOT_INFER_TRANSPORT] = "Cannot infer transport from URL";
+    axutil_error_messages[AXIS2_ERROR_CLIENT_SIDE_SUPPORT_ONLY_ONE_CONF_CTX]
+        = "Client side support only one configuration context";
+    axutil_error_messages[AXIS2_ERROR_MEP_CANNOT_BE_NULL_IN_MEP_CLIENT]
+        = "MEP cannot be NULL in MEP client";
+    axutil_error_messages[AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT] = "MEP mismatch";
+    axutil_error_messages[AXIS2_ERROR_TWO_WAY_CHANNEL_NEEDS_ADDRESSING]
+        = "Two way channel needs addressing module to be engaged";
     axutil_error_messages[AXIS2_ERROR_UNKNOWN_TRANSPORT] = "Unknown transport";
-    axutil_error_messages[AXIS2_ERROR_UNSUPPORTED_TYPE] =
-        "Type is not supported";
-    axutil_error_messages[AXIS2_ERROR_OPTIONS_OBJECT_IS_NOT_SET] =
-        "Options object is not set";
+    axutil_error_messages[AXIS2_ERROR_UNSUPPORTED_TYPE] = "Type is not supported";
+    axutil_error_messages[AXIS2_ERROR_OPTIONS_OBJECT_IS_NOT_SET] = "Options object is not set";
     /* core:clientapi:diclient */
 
     /* core:context */
-    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_ENVELOPE_STATE] =
-        "Invalid SOAP envelope state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_MSG_CTX] =
-        "Invalid message context state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_SVC] =
-        "Service accessed has invalid state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_SVC_GRP] =
-        "Service group accessed has invalid state";
-    axutil_error_messages[AXIS2_ERROR_SERVICE_NOT_YET_FOUND] =
-        "Service not yet found";
+    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_ENVELOPE_STATE] = "Invalid SOAP envelope state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_MSG_CTX] = "Invalid message context state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_SVC] = "Service accessed has invalid state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_SVC_GRP]
+        = "Service group accessed has invalid state";
+    axutil_error_messages[AXIS2_ERROR_SERVICE_NOT_YET_FOUND] = "Service not yet found";
     /* core:deployment */
-    axutil_error_messages[AXI2_ERROR_INVALID_PHASE] =
-        "Invalid phase found in phase validation*";
-    axutil_error_messages[AXIS2_ERROR_CONFIG_NOT_FOUND] =
-        "Configuration file cannot be found";
-    axutil_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] =
-        "Data element of the OM Node is NULL";
-    axutil_error_messages[AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT] =
-        "In transport sender, Inflow is not allowed";
-    axutil_error_messages[AXIS2_ERROR_INVALID_HANDLER_STATE] =
-        "Invalid handler state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_MODUELE_REF] =
-        "Invalid module reference encountered";
-    axutil_error_messages[AXIS2_ERROR_INVALID_MODUELE_REF_BY_OP] =
-        "Invalid module referenced by operation";
-    axutil_error_messages[AXIS2_ERROR_INVALID_MODULE_CONF] =
-        "Invalid module configuration";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_DESC_BUILDER] =
-        "Description builder is found to be in invalid state";
+    axutil_error_messages[AXI2_ERROR_INVALID_PHASE] = "Invalid phase found in phase validation*";
+    axutil_error_messages[AXIS2_ERROR_CONFIG_NOT_FOUND] = "Configuration file cannot be found";
+    axutil_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] = "Data element of the OM Node is NULL";
+    axutil_error_messages[AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT]
+        = "In transport sender, Inflow is not allowed";
+    axutil_error_messages[AXIS2_ERROR_INVALID_HANDLER_STATE] = "Invalid handler state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_MODUELE_REF] = "Invalid module reference encountered";
+    axutil_error_messages[AXIS2_ERROR_INVALID_MODUELE_REF_BY_OP]
+        = "Invalid module referenced by operation";
+    axutil_error_messages[AXIS2_ERROR_INVALID_MODULE_CONF] = "Invalid module configuration";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_DESC_BUILDER]
+        = "Description builder is found to be in invalid state";
     axutil_error_messages[AXIS2_ERROR_MODULE_NOT_FOUND] = "Module not found";
-    axutil_error_messages[AXIS2_ERROR_MODULE_VALIDATION_FAILED] =
-        "Module validation failed";
-    axutil_error_messages[AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE] =
-        "Module XML file is not found in the given path";
-    axutil_error_messages[AXIS2_ERROR_NO_DISPATCHER_FOUND] =
-        "No dispatcher found";
-    axutil_error_messages[AXIS2_ERROR_OP_NAME_MISSING] =
-        "Operation name is missing";
-    axutil_error_messages[AXIS2_ERROR_OUT_FLOW_NOT_ALLOWED_IN_TRS_IN] =
-        "In transport receiver, outflow is not allowed";
-    axutil_error_messages[AXIS2_ERROR_REPO_CAN_NOT_BE_NULL] =
-        "Repository name cannot be NULL";
-    axutil_error_messages[AXIS2_ERROR_REPOSITORY_NOT_EXIST] =
-        "Repository in path does not exist";
-    axutil_error_messages[AXIS2_ERROR_REPOS_LISTENER_INIT_FAILED] =
-        "Repository listener initialization failed";
-    axutil_error_messages[AXIS2_ERROR_SERVICE_XML_NOT_FOUND] =
-        "Service XML file is not found in the given path";
+    axutil_error_messages[AXIS2_ERROR_MODULE_VALIDATION_FAILED] = "Module validation failed";
+    axutil_error_messages[AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE]
+        = "Module XML file is not found in the given path";
+    axutil_error_messages[AXIS2_ERROR_NO_DISPATCHER_FOUND] = "No dispatcher found";
+    axutil_error_messages[AXIS2_ERROR_OP_NAME_MISSING] = "Operation name is missing";
+    axutil_error_messages[AXIS2_ERROR_OUT_FLOW_NOT_ALLOWED_IN_TRS_IN]
+        = "In transport receiver, outflow is not allowed";
+    axutil_error_messages[AXIS2_ERROR_REPO_CAN_NOT_BE_NULL] = "Repository name cannot be NULL";
+    axutil_error_messages[AXIS2_ERROR_REPOSITORY_NOT_EXIST] = "Repository in path does not exist";
+    axutil_error_messages[AXIS2_ERROR_REPOS_LISTENER_INIT_FAILED]
+        = "Repository listener initialization failed";
+    axutil_error_messages[AXIS2_ERROR_SERVICE_XML_NOT_FOUND]
+        = "Service XML file is not found in the given path";
     axutil_error_messages[AXIS2_ERROR_SVC_NAME_ERROR] = "Service name error";
-    axutil_error_messages[AXIS2_ERROR_TRANSPORT_SENDER_ERROR] =
-        "Transport sender error";
-    axutil_error_messages[AXIS2_PATH_TO_CONFIG_CAN_NOT_BE_NULL] =
-        "Path to configuration file can not be NULL";
+    axutil_error_messages[AXIS2_ERROR_TRANSPORT_SENDER_ERROR] = "Transport sender error";
+    axutil_error_messages[AXIS2_PATH_TO_CONFIG_CAN_NOT_BE_NULL]
+        = "Path to configuration file can not be NULL";
     axutil_error_messages[AXIS2_ERROR_INVALID_SVC] = "Invalid service";
     /* core:description */
-    axutil_error_messages[AXIS2_ERROR_CANNOT_CORRELATE_MSG] =
-        "Cannot correlate message";
-    axutil_error_messages[AXIS2_ERROR_COULD_NOT_MAP_MEP_URI_TO_MEP_CONSTANT] =
-        "Could not map the MEP URI to an Axis2/C MEP constant value";
-    axutil_error_messages[AXIS2_ERROR_INVALID_MESSAGE_ADDITION] =
-        "Invalid message addition operation context completed";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_MODULE_DESC] =
-        "Module description accessed has invalid state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER] =
-        "Parameter container not set";
-    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_OP] =
-        "Module has already been engaged to the operation";
-    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC] =
-        "Module has already been engaged on the service.";
-    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC_GRP] =
-        "Module has already been engaged on the service.";
-    axutil_error_messages[AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE] =
-        "Parameter locked, cannot override";
-    axutil_error_messages[AXIS2_ERROR_EMPTY_SCHEMA_LIST] =
-        "Schema list is empty or NULL in service";
+    axutil_error_messages[AXIS2_ERROR_CANNOT_CORRELATE_MSG] = "Cannot correlate message";
+    axutil_error_messages[AXIS2_ERROR_COULD_NOT_MAP_MEP_URI_TO_MEP_CONSTANT]
+        = "Could not map the MEP URI to an Axis2/C MEP constant value";
+    axutil_error_messages[AXIS2_ERROR_INVALID_MESSAGE_ADDITION]
+        = "Invalid message addition operation context completed";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_MODULE_DESC]
+        = "Module description accessed has invalid state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM_CONTAINER]
+        = "Parameter container not set";
+    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_OP]
+        = "Module has already been engaged to the operation";
+    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC]
+        = "Module has already been engaged on the service.";
+    axutil_error_messages[AXIS2_ERROR_MODULE_ALREADY_ENGAGED_TO_SVC_GRP]
+        = "Module has already been engaged on the service.";
+    axutil_error_messages[AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE]
+        = "Parameter locked, cannot override";
+    axutil_error_messages[AXIS2_ERROR_EMPTY_SCHEMA_LIST]
+        = "Schema list is empty or NULL in service";
     /* core:engine */
-    axutil_error_messages[AXIS2_ERROR_BEFORE_AFTER_HANDLERS_SAME] =
-        "Both before and after handlers cannot be the same";
-    axutil_error_messages[AXIS2_ERROR_INVALID_HANDLER_RULES] =
-        "Invalid handler rules";
+    axutil_error_messages[AXIS2_ERROR_BEFORE_AFTER_HANDLERS_SAME]
+        = "Both before and after handlers cannot be the same";
+    axutil_error_messages[AXIS2_ERROR_INVALID_HANDLER_RULES] = "Invalid handler rules";
     axutil_error_messages[AXIS2_ERROR_INVALID_MODULE] = "Invalid module";
-    axutil_error_messages[AXIS2_ERROR_INVALID_PHASE_FIRST_HANDLER] =
-        "Invalid first handler for phase";
-    axutil_error_messages[AXIS2_ERROR_INVALID_PHASE_LAST_HANDLER] =
-        "Invalid last handler for phase";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_CONF] =
-        "Invalid engine configuration state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PROCESSING_FAULT_ALREADY] =
-        "Message context processing a fault already";
-    axutil_error_messages[AXIS2_ERROR_NOWHERE_TO_SEND_FAULT] =
-        "fault to field not specified in message context";
-    axutil_error_messages[AXIS2_ERROR_PHASE_ADD_HANDLER_INVALID] =
-        "Only one handler allowed for phase, adding another handler is not allowed";
-    axutil_error_messages[AXIS2_ERROR_PHASE_FIRST_HANDLER_ALREADY_SET] =
-        "First handler of phase already set";
-    axutil_error_messages[AXIS2_ERROR_PHASE_LAST_HANDLER_ALREADY_SET] =
-        "Last handler of phase already set";
-    axutil_error_messages[AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME] =
-        "Two service can not have same name, a service with same name already";
+    axutil_error_messages[AXIS2_ERROR_INVALID_PHASE_FIRST_HANDLER]
+        = "Invalid first handler for phase";
+    axutil_error_messages[AXIS2_ERROR_INVALID_PHASE_LAST_HANDLER]
+        = "Invalid last handler for phase";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_CONF] = "Invalid engine configuration state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PROCESSING_FAULT_ALREADY]
+        = "Message context processing a fault already";
+    axutil_error_messages[AXIS2_ERROR_NOWHERE_TO_SEND_FAULT]
+        = "fault to field not specified in message context";
+    axutil_error_messages[AXIS2_ERROR_PHASE_ADD_HANDLER_INVALID]
+        = "Only one handler allowed for phase, adding another handler is not allowed";
+    axutil_error_messages[AXIS2_ERROR_PHASE_FIRST_HANDLER_ALREADY_SET]
+        = "First handler of phase already set";
+    axutil_error_messages[AXIS2_ERROR_PHASE_LAST_HANDLER_ALREADY_SET]
+        = "Last handler of phase already set";
+    axutil_error_messages[AXIS2_ERROR_TWO_SVCS_CANNOT_HAVE_SAME_NAME]
+        = "Two service can not have same name, a service with same name already";
     /* core:phaseresolver */
-    axutil_error_messages[AXIS2_ERROR_INVALID_MODULE_REF] =
-        "Invalid module reference";
+    axutil_error_messages[AXIS2_ERROR_INVALID_MODULE_REF] = "Invalid module reference";
     axutil_error_messages[AXIS2_ERROR_INVALID_PHASE] = "Invalid Phase";
-    axutil_error_messages[AXIS2_ERROR_NO_TRANSPORT_IN_CONFIGURED] =
-        "There are no in transport chains configured";
-    axutil_error_messages[AXIS2_ERROR_NO_TRANSPORT_OUT_CONFIGURED] =
-        "There are no out transport chains configured";
-    axutil_error_messages[AXIS2_ERROR_PHASE_IS_NOT_SPECIFED] =
-        "Phase is not specified";
+    axutil_error_messages[AXIS2_ERROR_NO_TRANSPORT_IN_CONFIGURED]
+        = "There are no in transport chains configured";
+    axutil_error_messages[AXIS2_ERROR_NO_TRANSPORT_OUT_CONFIGURED]
+        = "There are no out transport chains configured";
+    axutil_error_messages[AXIS2_ERROR_PHASE_IS_NOT_SPECIFED] = "Phase is not specified";
     axutil_error_messages[AXIS2_ERROR_SERVICE_MODULE_CAN_NOT_REFER_GLOBAL_PHASE]
         = "Service module can not refer global phase";
     /* core:wsdl */
     axutil_error_messages[AXIS2_ERROR_WSDL_SCHEMA_IS_NULL] = "Schema is NULL";
     /* core:receivers */
-    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_INVALID_STATE] =
-        "AXIOM element has invalid state";
-    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_MISMATCH] =
-        "AXIOM elements do not match";
-    axutil_error_messages[AXIS2_ERROR_RPC_NEED_MATCHING_CHILD] =
-        "RPC style SOAP body don't have a child element";
-    axutil_error_messages[AXIS2_ERROR_UNKNOWN_STYLE] =
-        "Operation description has unknown operation style";
+    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_INVALID_STATE] = "AXIOM element has invalid state";
+    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_MISMATCH] = "AXIOM elements do not match";
+    axutil_error_messages[AXIS2_ERROR_RPC_NEED_MATCHING_CHILD]
+        = "RPC style SOAP body don't have a child element";
+    axutil_error_messages[AXIS2_ERROR_UNKNOWN_STYLE]
+        = "Operation description has unknown operation style";
     axutil_error_messages[AXIS2_ERROR_STRING_DOES_NOT_REPRESENT_A_VALID_NC_NAME]
         = "String does not represent a valid NCName";
     /* core:transport */
 
     /* core:transport:http */
-    axutil_error_messages[AXIS2_ERROR_HTTP_CLIENT_TRANSPORT_ERROR] =
-        "Error occurred in transport";
-    axutil_error_messages[AXIS2_ERROR_HTTP_REQUEST_NOT_SENT] =
-        "A read attempt(HTTP) for the reply without sending the request";
-    axutil_error_messages[AXIS2_ERROR_INVALID_HEADER] =
-        "Invalid string passed as a HTTP header";
-    axutil_error_messages[AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE] =
-        "Invalid status line or invalid request line";
-    axutil_error_messages[AXIS2_ERROR_INVALID_TRANSPORT_PROTOCOL] =
-        "Transport protocol is unsupported by axis2";
-    axutil_error_messages[AXIS2_ERROR_NULL_BODY] =
-        "No body present in the request or the response";
-    axutil_error_messages[AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT] =
-        "A valid configuration context is required for the HTTP worker";
-    axutil_error_messages[AXIS2_ERROR_NULL_HTTP_VERSION] =
-        "HTTP version cannot be NULL in the status/request line";
-    axutil_error_messages[AXIS2_ERROR_NULL_IN_STREAM_IN_MSG_CTX] =
-        "Input stream is NULL in message context";
+    axutil_error_messages[AXIS2_ERROR_HTTP_CLIENT_TRANSPORT_ERROR] = "Error occurred in transport";
+    axutil_error_messages[AXIS2_ERROR_HTTP_REQUEST_NOT_SENT]
+        = "A read attempt(HTTP) for the reply without sending the request";
+    axutil_error_messages[AXIS2_ERROR_INVALID_HEADER] = "Invalid string passed as a HTTP header";
+    axutil_error_messages[AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE]
+        = "Invalid status line or invalid request line";
+    axutil_error_messages[AXIS2_ERROR_INVALID_TRANSPORT_PROTOCOL]
+        = "Transport protocol is unsupported by axis2";
+    axutil_error_messages[AXIS2_ERROR_NULL_BODY] = "No body present in the request or the response";
+    axutil_error_messages[AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT]
+        = "A valid configuration context is required for the HTTP worker";
+    axutil_error_messages[AXIS2_ERROR_NULL_HTTP_VERSION]
+        = "HTTP version cannot be NULL in the status/request line";
+    axutil_error_messages[AXIS2_ERROR_NULL_IN_STREAM_IN_MSG_CTX]
+        = "Input stream is NULL in message context";
     axutil_error_messages[AXIS2_ERROR_NULL_OM_OUTPUT] = "OM output is NULL";
-    axutil_error_messages[AXIS2_ERROR_NULL_SOAP_ENVELOPE_IN_MSG_CTX] =
-        "NULL SOAP envelope in message context";
-    axutil_error_messages[AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM] =
-        "NULL stream in the HTTP chucked stream";
-    axutil_error_messages[AXIS2_ERROR_NULL_STREAM_IN_RESPONSE_BODY] =
-        "NULL stream in the response body";
+    axutil_error_messages[AXIS2_ERROR_NULL_SOAP_ENVELOPE_IN_MSG_CTX]
+        = "NULL SOAP envelope in message context";
+    axutil_error_messages[AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM]
+        = "NULL stream in the HTTP chucked stream";
+    axutil_error_messages[AXIS2_ERROR_NULL_STREAM_IN_RESPONSE_BODY]
+        = "NULL stream in the response body";
     axutil_error_messages[AXIS2_ERROR_NULL_URL] = "URL NULL in HTTP client";
-    axutil_error_messages[AXIS2_ERROR_OUT_TRNSPORT_INFO_NULL] =
-        "Transport information must be set in message context";
-    axutil_error_messages[AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING] =
-        "Content-Type header missing in HTTP response";
-    axutil_error_messages[AXIS2_ERROR_RESPONSE_TIMED_OUT] =
-        "Response timed out";
-    axutil_error_messages[AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL] =
-        "SOAP envelope or SOAP body NULL";
-    axutil_error_messages[AXIS2_ERROR_SSL_ENGINE] =
-        "Error occurred in SSL engine";
-    axutil_error_messages[AXIS2_ERROR_SSL_NO_CA_FILE] =
-        "Cannot find certificates";
-    axutil_error_messages[AXIS2_ERROR_WRITING_RESPONSE] =
-        "Error in writing the response in response writer";
-    axutil_error_messages[AXIS2_ERROR_REQD_PARAM_MISSING] =
-        "Required parameter is missing in URL encoded request";
-    axutil_error_messages[AXIS2_ERROR_UNSUPPORTED_SCHEMA_TYPE] =
-        " Unsupported schema type in REST";
-    axutil_error_messages[AXIS2_ERROR_SVC_OR_OP_NOT_FOUND] =
-        "Service or operation not found";
+    axutil_error_messages[AXIS2_ERROR_OUT_TRNSPORT_INFO_NULL]
+        = "Transport information must be set in message context";
+    axutil_error_messages[AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING]
+        = "Content-Type header missing in HTTP response";
+    axutil_error_messages[AXIS2_ERROR_RESPONSE_TIMED_OUT] = "Response timed out";
+    axutil_error_messages[AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL]
+        = "SOAP envelope or SOAP body NULL";
+    axutil_error_messages[AXIS2_ERROR_SSL_ENGINE] = "Error occurred in SSL engine";
+    axutil_error_messages[AXIS2_ERROR_SSL_NO_CA_FILE] = "Cannot find certificates";
+    axutil_error_messages[AXIS2_ERROR_WRITING_RESPONSE]
+        = "Error in writing the response in response writer";
+    axutil_error_messages[AXIS2_ERROR_REQD_PARAM_MISSING]
+        = "Required parameter is missing in URL encoded request";
+    axutil_error_messages[AXIS2_ERROR_UNSUPPORTED_SCHEMA_TYPE] = " Unsupported schema type in REST";
+    axutil_error_messages[AXIS2_ERROR_SVC_OR_OP_NOT_FOUND] = "Service or operation not found";
     /* mod_addr */
-    axutil_error_messages[AXIS2_ERROR_NO_MSG_INFO_HEADERS] =
-            "No messgae info headers";
+    axutil_error_messages[AXIS2_ERROR_NO_MSG_INFO_HEADERS] = "No messgae info headers";
     /* platforms */
 
     /* utils */
-    axutil_error_messages[AXIS2_ERROR_COULD_NOT_OPEN_FILE] =
-        "Could not open the file";
-    axutil_error_messages[AXIS2_ERROR_DLL_CREATE_FAILED] =
-        "Failed in creating DLL";
-    axutil_error_messages[AXIS2_ERROR_DLL_LOADING_FAILED] =
-        "DLL loading failed";
-    axutil_error_messages[AXIS2_ERROR_ENVIRONMENT_IS_NULL] =
-        "Environment passed is NULL";
-    axutil_error_messages[AXIS2_ERROR_FILE_NAME_NOT_SET] =
-        "Axis2 File does not have a file name";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_DLL_DESC] =
-        "DLL description has invalid state of not having valid DLL create function, \
+    axutil_error_messages[AXIS2_ERROR_COULD_NOT_OPEN_FILE] = "Could not open the file";
+    axutil_error_messages[AXIS2_ERROR_DLL_CREATE_FAILED] = "Failed in creating DLL";
+    axutil_error_messages[AXIS2_ERROR_DLL_LOADING_FAILED] = "DLL loading failed";
+    axutil_error_messages[AXIS2_ERROR_ENVIRONMENT_IS_NULL] = "Environment passed is NULL";
+    axutil_error_messages[AXIS2_ERROR_FILE_NAME_NOT_SET] = "Axis2 File does not have a file name";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_DLL_DESC]
+        = "DLL description has invalid state of not having valid DLL create function, \
         of valid delete function or valid dll_handler";
-    axutil_error_messages[AXIS2_ERROR_HANDLER_CREATION_FAILED] =
-        "Failed in creating Handler";
-    axutil_error_messages[AXIS2_ERROR_INDEX_OUT_OF_BOUNDS] =
-        "Array list index out of bounds";
-    axutil_error_messages[AXIS2_ERROR_INVALID_ADDRESS] =
-        "Invalid IP or hostname";
-    axutil_error_messages[AXIS2_ERROR_INVALID_FD] =
-        "Trying to do operation on invalid file descriptor";
-    axutil_error_messages[AXIS2_ERROR_INVALID_SOCKET] =
-        "Trying to do operation on closed/not opened socket";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM] =
-        "Parameter not set";
-    axutil_error_messages[AXIS2_ERROR_MODULE_CREATION_FAILED] =
-        "Module create failed";
-    axutil_error_messages[AXIS2_ERROR_MSG_RECV_CREATION_FAILED] =
-        "Failed in creating Message Receiver";
+    axutil_error_messages[AXIS2_ERROR_HANDLER_CREATION_FAILED] = "Failed in creating Handler";
+    axutil_error_messages[AXIS2_ERROR_INDEX_OUT_OF_BOUNDS] = "Array list index out of bounds";
+    axutil_error_messages[AXIS2_ERROR_INVALID_ADDRESS] = "Invalid IP or hostname";
+    axutil_error_messages[AXIS2_ERROR_INVALID_FD]
+        = "Trying to do operation on invalid file descriptor";
+    axutil_error_messages[AXIS2_ERROR_INVALID_SOCKET]
+        = "Trying to do operation on closed/not opened socket";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_PARAM] = "Parameter not set";
+    axutil_error_messages[AXIS2_ERROR_MODULE_CREATION_FAILED] = "Module create failed";
+    axutil_error_messages[AXIS2_ERROR_MSG_RECV_CREATION_FAILED]
+        = "Failed in creating Message Receiver";
     axutil_error_messages[AXIS2_ERROR_NO_SUCH_ELEMENT] = "No such element";
-    axutil_error_messages[AXIS2_ERROR_SOCKET_BIND_FAILED] =
-        "Socket bind failed. Another process may be already using this port";
-    axutil_error_messages[AXIS2_ERROR_SOCKET_ERROR] =
-        "Error creating a socket. Most probably error returned by OS";
-    axutil_error_messages[AXIS2_ERROR_SOCKET_LISTEN_FAILED] =
-        "Listen failed for the server socket";
-    axutil_error_messages[AXIS2_ERROR_SVC_SKELETON_CREATION_FAILED] =
-        "Failed in creating Service Skeleton";
-    axutil_error_messages[AXIS2_ERROR_TRANSPORT_RECV_CREATION_FAILED] =
-        "Failed in creating Transport Receiver";
-    axutil_error_messages[AXIS2_ERROR_TRANSPORT_SENDER_CREATION_FAILED] =
-        "Failed in creating Transport Sender";
-    axutil_error_messages[AXIS2_ERROR_UUID_GEN_FAILED] =
-        "Generation of platform dependent UUID failed";
+    axutil_error_messages[AXIS2_ERROR_SOCKET_BIND_FAILED]
+        = "Socket bind failed. Another process may be already using this port";
+    axutil_error_messages[AXIS2_ERROR_SOCKET_ERROR]
+        = "Error creating a socket. Most probably error returned by OS";
+    axutil_error_messages[AXIS2_ERROR_SOCKET_LISTEN_FAILED] = "Listen failed for the server socket";
+    axutil_error_messages[AXIS2_ERROR_SVC_SKELETON_CREATION_FAILED]
+        = "Failed in creating Service Skeleton";
+    axutil_error_messages[AXIS2_ERROR_TRANSPORT_RECV_CREATION_FAILED]
+        = "Failed in creating Transport Receiver";
+    axutil_error_messages[AXIS2_ERROR_TRANSPORT_SENDER_CREATION_FAILED]
+        = "Failed in creating Transport Sender";
+    axutil_error_messages[AXIS2_ERROR_UUID_GEN_FAILED]
+        = "Generation of platform dependent UUID failed";
     axutil_error_messages[AXIS2_ERROR_POSSIBLE_DEADLOCK] = "Possible deadlock";
     /* WSDL */
-    axutil_error_messages
-        [AXIS2_ERROR_INTERFACE_OR_PORT_TYPE_NOT_FOUND_FOR_THE_BINDING] =
-        "Interface or Port Type not found for the binding";
-    axutil_error_messages
-        [AXIS2_ERROR_INTERFACES_OR_PORTS_NOT_FOUND_FOR_PARTIALLY_BUILT_WOM] =
-        "Interfaces or Ports not found for the partially built WOM";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_OP] =
-        "WSDL operation accessed has invalid state";
-    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_SVC] =
-        "WSDL Service accessed has invalid state";
-    axutil_error_messages[AXIS2_ERROR_MEP_CANNOT_DETERMINE_MEP] =
-        "Cannot determine MEP";
-    axutil_error_messages[AXIS2_ERROR_WSDL_BINDING_NAME_IS_REQUIRED] =
-        "WSDL binding name is cannot be NULL";
-    axutil_error_messages[AXIS2_ERROR_WSDL_INTERFACE_NAME_IS_REQUIRED] =
-        "PortType/Interface name cannot be NULL";
-    axutil_error_messages[AXIS2_ERROR_WSDL_PARSER_INVALID_STATE] =
-        "WSDL parsing has resulted in an invalid state";
-    axutil_error_messages[AXIS2_ERROR_WSDL_SVC_NAME_IS_REQUIRED] =
-        "WSDL service name cannot be NULL";
+    axutil_error_messages[AXIS2_ERROR_INTERFACE_OR_PORT_TYPE_NOT_FOUND_FOR_THE_BINDING]
+        = "Interface or Port Type not found for the binding";
+    axutil_error_messages[AXIS2_ERROR_INTERFACES_OR_PORTS_NOT_FOUND_FOR_PARTIALLY_BUILT_WOM]
+        = "Interfaces or Ports not found for the partially built WOM";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_OP]
+        = "WSDL operation accessed has invalid state";
+    axutil_error_messages[AXIS2_ERROR_INVALID_STATE_WSDL_SVC]
+        = "WSDL Service accessed has invalid state";
+    axutil_error_messages[AXIS2_ERROR_MEP_CANNOT_DETERMINE_MEP] = "Cannot determine MEP";
+    axutil_error_messages[AXIS2_ERROR_WSDL_BINDING_NAME_IS_REQUIRED]
+        = "WSDL binding name is cannot be NULL";
+    axutil_error_messages[AXIS2_ERROR_WSDL_INTERFACE_NAME_IS_REQUIRED]
+        = "PortType/Interface name cannot be NULL";
+    axutil_error_messages[AXIS2_ERROR_WSDL_PARSER_INVALID_STATE]
+        = "WSDL parsing has resulted in an invalid state";
+    axutil_error_messages[AXIS2_ERROR_WSDL_SVC_NAME_IS_REQUIRED]
+        = "WSDL service name cannot be NULL";
     /* XML */
 
     /* XML:attachments */
-    axutil_error_messages[AXIS2_ERROR_ATTACHMENT_MISSING] =
-        "Attachment is missing";
+    axutil_error_messages[AXIS2_ERROR_ATTACHMENT_MISSING] = "Attachment is missing";
     /* XML:om */
-    axutil_error_messages[AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL] =
-        "XML builder done with pulling. Pull parser cannot pull any more";
-    axutil_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD] =
-        "Discard failed because the builder state is invalid";
-    axutil_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL] =
-        "Invalid builder state; Builder's last node is NULL";
-    axutil_error_messages[AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL] =
-        "Invalid document state; Document root is NULL";
-    axutil_error_messages
-        [AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE] =
-        "Undefined namespace used";
-    axutil_error_messages[AXIS2_ERROR_INVALID_EMPTY_NAMESPACE_URI] =
-        "Namespace should have a valid URI";
-    axutil_error_messages
-        [AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED] =
-        "Next method has not been called so cannot remove"
-        "an element before calling next valid for any om iterator";
+    axutil_error_messages[AXIS2_ERROR_BUILDER_DONE_CANNOT_PULL]
+        = "XML builder done with pulling. Pull parser cannot pull any more";
+    axutil_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_CANNOT_DISCARD]
+        = "Discard failed because the builder state is invalid";
+    axutil_error_messages[AXIS2_ERROR_INVALID_BUILDER_STATE_LAST_NODE_NULL]
+        = "Invalid builder state; Builder's last node is NULL";
+    axutil_error_messages[AXIS2_ERROR_INVALID_DOCUMENT_STATE_ROOT_NULL]
+        = "Invalid document state; Document root is NULL";
+    axutil_error_messages[AXIS2_ERROR_INVALID_DOCUMENT_STATE_UNDEFINED_NAMESPACE]
+        = "Undefined namespace used";
+    axutil_error_messages[AXIS2_ERROR_INVALID_EMPTY_NAMESPACE_URI]
+        = "Namespace should have a valid URI";
+    axutil_error_messages[AXIS2_ERROR_ITERATOR_NEXT_METHOD_HAS_NOT_YET_BEEN_CALLED]
+        = "Next method has not been called so cannot remove"
+            "an element before calling next valid for any om iterator";
     axutil_error_messages[AXIS2_ERROR_ITERATOR_REMOVE_HAS_ALREADY_BEING_CALLED]
         = "Document root is NULL, when it is not supposed to be NULL";
-    axutil_error_messages[AXIS2_ERROR_XML_READER_ELEMENT_NULL] =
-        "AXIOM XML reader returned NULL element";
-    axutil_error_messages[AXIS2_ERROR_XML_READER_VALUE_NULL] =
-        "AXIOM XML reader returned NULL value";
+    axutil_error_messages[AXIS2_ERROR_XML_READER_ELEMENT_NULL]
+        = "AXIOM XML reader returned NULL element";
+    axutil_error_messages[AXIS2_ERROR_XML_READER_VALUE_NULL]
+        = "AXIOM XML reader returned NULL value";
     /* XML:parser */
-    axutil_error_messages[AXIS2_ERROR_CREATING_XML_STREAM_READER] =
-        "Error occurred creating XML stream reader";
-    axutil_error_messages[AXIS2_ERROR_CREATING_XML_STREAM_WRITER] =
-        "Error occurred creating XML stream writer";
-    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE] =
-        "Error in writing attribute";
-    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE] =
-        "Error in writing attribute with namespace";
-    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX] =
-        "Error in writing attribute with namespace prefix";
-    axutil_error_messages[AXIS2_ERROR_WRITING_COMMENT] =
-        "Error in writing comment";
-    axutil_error_messages[AXIS2_ERROR_WRITING_DATA_SOURCE] =
-        "Error in writing data source";
-    axutil_error_messages[AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE] =
-        "Error in writing default namespace";
+    axutil_error_messages[AXIS2_ERROR_CREATING_XML_STREAM_READER]
+        = "Error occurred creating XML stream reader";
+    axutil_error_messages[AXIS2_ERROR_CREATING_XML_STREAM_WRITER]
+        = "Error occurred creating XML stream writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE] = "Error in writing attribute";
+    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE]
+        = "Error in writing attribute with namespace";
+    axutil_error_messages[AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX]
+        = "Error in writing attribute with namespace prefix";
+    axutil_error_messages[AXIS2_ERROR_WRITING_COMMENT] = "Error in writing comment";
+    axutil_error_messages[AXIS2_ERROR_WRITING_DATA_SOURCE] = "Error in writing data source";
+    axutil_error_messages[AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE]
+        = "Error in writing default namespace";
     axutil_error_messages[AXIS2_ERROR_WRITING_DTD] = "Error in writing DDT";
-    axutil_error_messages[AXIS2_ERROR_WRITING_EMPTY_ELEMENT] =
-        "Error occurred in writing empty element";
-    axutil_error_messages[AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE] =
-        "Error occurred in writing empty element with namespace";
-    axutil_error_messages
-        [AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX] =
-        "Error in writing empty element with namespace prefix";
-    axutil_error_messages[AXIS2_ERROR_WRITING_END_DOCUMENT] =
-        "Error occurred in writing end document in XML writer";
-    axutil_error_messages[AXIS2_ERROR_WRITING_END_ELEMENT] =
-        "Error occurred in writing end element in XML writer";
-    axutil_error_messages[AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION] =
-        "Error in writing processing instruction";
-    axutil_error_messages[AXIS2_ERROR_WRITING_START_DOCUMENT] =
-        "Error occurred in writing start element in start document in XML writer";
-    axutil_error_messages[AXIS2_ERROR_WRITING_START_ELEMENT] =
-        "Error occurred in writing start element in XML writer";
-    axutil_error_messages[AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE] =
-        "Error occurred in writing start element with namespace in XML writer";
-    axutil_error_messages
-        [AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX] =
-        "Error occurred in writing start element with namespace prefix";
-    axutil_error_messages[AXIS2_ERROR_WRITING_CDATA] =
-        "Error in writing CDATA section";
-    axutil_error_messages[AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE] =
-        "AXIS2_XML_PARSER_TYPE_BUFFER or AXIS2_XML_PARSER_TYPE_DOC is expected";
+    axutil_error_messages[AXIS2_ERROR_WRITING_EMPTY_ELEMENT]
+        = "Error occurred in writing empty element";
+    axutil_error_messages[AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE]
+        = "Error occurred in writing empty element with namespace";
+    axutil_error_messages[AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX]
+        = "Error in writing empty element with namespace prefix";
+    axutil_error_messages[AXIS2_ERROR_WRITING_END_DOCUMENT]
+        = "Error occurred in writing end document in XML writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_END_ELEMENT]
+        = "Error occurred in writing end element in XML writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION]
+        = "Error in writing processing instruction";
+    axutil_error_messages[AXIS2_ERROR_WRITING_START_DOCUMENT]
+        = "Error occurred in writing start element in start document in XML writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_START_ELEMENT]
+        = "Error occurred in writing start element in XML writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE]
+        = "Error occurred in writing start element with namespace in XML writer";
+    axutil_error_messages[AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX]
+        = "Error occurred in writing start element with namespace prefix";
+    axutil_error_messages[AXIS2_ERROR_WRITING_CDATA] = "Error in writing CDATA section";
+    axutil_error_messages[AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE]
+        = "AXIS2_XML_PARSER_TYPE_BUFFER or AXIS2_XML_PARSER_TYPE_DOC is expected";
 
     /* invalid type passed */
-    axutil_error_messages[AXIS2_ERROR_INVALID_BASE_TYPE] =
-        "Invalid base type passed";
-    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI] =
-        "Invalid SOAP namespace URI found";
-    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_VERSION] =
-        "Invalid SOAP version";
-    axutil_error_messages[AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND] =
-        "Invalid value found in must understand";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_CODE_ELEMENTS_ENCOUNTERED] =
-        "Multiple  fault code elements encountered in SOAP fault";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED] =
-        "Multiple fault detail elements encountered in SOAP fault";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED] =
-        "Multiple fault node elements encountered in SOAP fault";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED] =
-        "Multiple fault reason elements encountered in SOAP fault";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED] =
-        "Multiple fault role elements encountered in SOAP fault ";
-    axutil_error_messages[AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED] =
-        "Multiple fault sub-code value elements encountered";
-    axutil_error_messages
-        [AXIS2_ERROR_MULTIPLE_VALUE_ENCOUNTERED_IN_CODE_ELEMENT] =
-        "Multiple fault value elements encountered";
+    axutil_error_messages[AXIS2_ERROR_INVALID_BASE_TYPE] = "Invalid base type passed";
+    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_NAMESPACE_URI]
+        = "Invalid SOAP namespace URI found";
+    axutil_error_messages[AXIS2_ERROR_INVALID_SOAP_VERSION] = "Invalid SOAP version";
+    axutil_error_messages[AXIS2_ERROR_INVALID_VALUE_FOUND_IN_MUST_UNDERSTAND]
+        = "Invalid value found in must understand";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_CODE_ELEMENTS_ENCOUNTERED]
+        = "Multiple  fault code elements encountered in SOAP fault";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_DETAIL_ELEMENTS_ENCOUNTERED]
+        = "Multiple fault detail elements encountered in SOAP fault";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_NODE_ELEMENTS_ENCOUNTERED]
+        = "Multiple fault node elements encountered in SOAP fault";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_REASON_ELEMENTS_ENCOUNTERED]
+        = "Multiple fault reason elements encountered in SOAP fault";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED]
+        = "Multiple fault role elements encountered in SOAP fault ";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_SUB_CODE_VALUES_ENCOUNTERED]
+        = "Multiple fault sub-code value elements encountered";
+    axutil_error_messages[AXIS2_ERROR_MULTIPLE_VALUE_ENCOUNTERED_IN_CODE_ELEMENT]
+        = "Multiple fault value elements encountered";
     axutil_error_messages[AXIS2_ERROR_MUST_UNDERSTAND_SHOULD_BE_1_0_TRUE_FALSE]
         = "Must understand attribute should have a value of either true or false";
-    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_EXPECTED] =
-        "AXIOM element is expected";
-    axutil_error_messages[AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE] =
-        "Processing SOAP 1.1 fault value element should have only"
-        "text as its children";
-    axutil_error_messages[AXIS2_ERROR_ONLY_ONE_SOAP_FAULT_ALLOWED_IN_BODY] =
-        "Only one SOAP fault is allowed in SOAP body";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS] =
-        "SOAP 1.1 fault actor should not have any child elements";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_BUILDER_ENVELOPE_CAN_HAVE_ONLY_HEADER_AND_BODY] =
-        "SOAP builder found a child element other than header or body in envelope"
-        "element";
-    axutil_error_messages[AXIS2_ERROR_SOAP_BUILDER_HEADER_BODY_WRONG_ORDER] =
-        "SOAP builder encountered body element first and header next";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_BODY_ELEMENTS_ENCOUNTERED] =
-        "SOAP builder multiple body elements encountered";
+    axutil_error_messages[AXIS2_ERROR_OM_ELEMENT_EXPECTED] = "AXIOM element is expected";
+    axutil_error_messages[AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE]
+        = "Processing SOAP 1.1 fault value element should have only"
+            "text as its children";
+    axutil_error_messages[AXIS2_ERROR_ONLY_ONE_SOAP_FAULT_ALLOWED_IN_BODY]
+        = "Only one SOAP fault is allowed in SOAP body";
+    axutil_error_messages[AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS]
+        = "SOAP 1.1 fault actor should not have any child elements";
+    axutil_error_messages[AXIS2_ERROR_SOAP_BUILDER_ENVELOPE_CAN_HAVE_ONLY_HEADER_AND_BODY]
+        = "SOAP builder found a child element other than header or body in envelope"
+            "element";
+    axutil_error_messages[AXIS2_ERROR_SOAP_BUILDER_HEADER_BODY_WRONG_ORDER]
+        = "SOAP builder encountered body element first and header next";
+    axutil_error_messages[AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_BODY_ELEMENTS_ENCOUNTERED]
+        = "SOAP builder multiple body elements encountered";
     axutil_error_messages[AXIS2_ERROR_SOAP_BUILDER_MULTIPLE_HEADERS_ENCOUNTERED]
         = "SOAP builder encountered multiple headers";
-    axutil_error_messages[AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE] =
-        "SOAP fault code does not have a value";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT] =
-        "SOAP fault reason element should have a text value";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_FAULT_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT] =
-        "SOAP fault role element should have a text value";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_FAULT_VALUE_SHOULD_BE_PRESENT_BEFORE_SUB_CODE] =
-        "SOAP fault value should be present before sub-code element in SOAP fault code";
+    axutil_error_messages[AXIS2_ERROR_SOAP_FAULT_CODE_DOES_NOT_HAVE_A_VALUE]
+        = "SOAP fault code does not have a value";
+    axutil_error_messages[AXIS2_ERROR_SOAP_FAULT_REASON_ELEMENT_SHOULD_HAVE_A_TEXT]
+        = "SOAP fault reason element should have a text value";
+    axutil_error_messages[AXIS2_ERROR_SOAP_FAULT_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT]
+        = "SOAP fault role element should have a text value";
+    axutil_error_messages[AXIS2_ERROR_SOAP_FAULT_VALUE_SHOULD_BE_PRESENT_BEFORE_SUB_CODE]
+        = "SOAP fault value should be present before sub-code element in SOAP fault code";
     axutil_error_messages[AXIS2_ERROR_SOAP_MESSAGE_DOES_NOT_CONTAIN_AN_ENVELOPE]
         = "SOAP message does not contain a SOAP envelope element";
-    axutil_error_messages
-        [AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME] =
-        "SOAP message's first element should have a localname";
-    axutil_error_messages
-        [AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_REASON_ELEMENT]
+    axutil_error_messages[AXIS2_ERROR_SOAP_MESSAGE_FIRST_ELEMENT_MUST_CONTAIN_LOCAL_NAME]
+        = "SOAP message's first element should have a localname";
+    axutil_error_messages[AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_REASON_ELEMENT]
         = "Localname not supported inside a reason element";
-    axutil_error_messages
-        [AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT]
+    axutil_error_messages[AXIS2_ERROR_THIS_LOCALNAME_IS_NOT_SUPPORTED_INSIDE_THE_SUB_CODE_ELEMENT]
         = "Localname not supported inside the sub-code element";
-    axutil_error_messages
-        [AXIS2_ERROR_THIS_LOCALNAME_NOT_SUPPORTED_INSIDE_THE_CODE_ELEMENT] =
-        "Localname not supported inside the code element";
-    axutil_error_messages
-        [AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP] =
-        "Transport identified SOAP version does not match with SOAP message version";
+    axutil_error_messages[AXIS2_ERROR_THIS_LOCALNAME_NOT_SUPPORTED_INSIDE_THE_CODE_ELEMENT]
+        = "Localname not supported inside the code element";
+    axutil_error_messages[AXIS2_ERROR_TRANSPORT_LEVEL_INFORMATION_DOES_NOT_MATCH_WITH_SOAP]
+        = "Transport identified SOAP version does not match with SOAP message version";
     axutil_error_messages[AXIS2_ERROR_UNSUPPORTED_ELEMENT_IN_SOAP_FAULT_ELEMENT]
         = "Unsupported element found in SOAP fault element";
-    axutil_error_messages[AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED] =
-        "Wrong element order encountered ";
+    axutil_error_messages[AXIS2_ERROR_WRONG_ELEMENT_ORDER_ENCOUNTERED]
+        = "Wrong element order encountered ";
     /* services */
-    axutil_error_messages[AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST] =
-        "Invalid XML format in request";
-    axutil_error_messages[AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL] =
-        "Input OM node NULL, Probably error in SOAP request";
-    axutil_error_messages
-        [AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST] =
-        "Invalid parameters for service operation in SOAP request";
+    axutil_error_messages[AXIS2_ERROR_SVC_SKEL_INVALID_XML_FORMAT_IN_REQUEST]
+        = "Invalid XML format in request";
+    axutil_error_messages[AXIS2_ERROR_SVC_SKEL_INPUT_OM_NODE_NULL]
+        = "Input OM node NULL, Probably error in SOAP request";
+    axutil_error_messages[AXIS2_ERROR_SVC_SKEL_INVALID_OPERATION_PARAMETERS_IN_SOAP_REQUEST]
+        = "Invalid parameters for service operation in SOAP request";
 
     axutil_error_messages[AXIS2_ERROR_WSDL_SCHEMA_IS_NULL] = "Schema is NULL";
 
     /* repos */
-    axutil_error_messages[AXIS2_ERROR_REPOS_NOT_AUTHENTICATED] =
-        "Not authenticated";
-    axutil_error_messages[AXIS2_ERROR_REPOS_UNSUPPORTED_MODE] =
-        "Unsupported mode";
+    axutil_error_messages[AXIS2_ERROR_REPOS_NOT_AUTHENTICATED] = "Not authenticated";
+    axutil_error_messages[AXIS2_ERROR_REPOS_UNSUPPORTED_MODE] = "Unsupported mode";
     axutil_error_messages[AXIS2_ERROR_REPOS_EXPIRED] = "Expired";
-    axutil_error_messages[AXIS2_ERROR_REPOS_NOT_IMPLEMENTED] =
-        "Not implemented";
+    axutil_error_messages[AXIS2_ERROR_REPOS_NOT_IMPLEMENTED] = "Not implemented";
     axutil_error_messages[AXIS2_ERROR_REPOS_NOT_FOUND] = "Not found";
-    axutil_error_messages[AXIS2_ERROR_REPOS_BAD_SEARCH_TEXT] =
-        "Bad search text";
+    axutil_error_messages[AXIS2_ERROR_REPOS_BAD_SEARCH_TEXT] = "Bad search text";
 
     /* neethi */
-    axutil_error_messages[AXIS2_ERROR_NEETHI_ELEMENT_WITH_NO_NAMESPACE] =
-        "Element with no namespace";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED_FROM_ELEMENT] =
-        "Policy creation failed from element";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED_FROM_ELEMENT] =
-        "All creation failed from element";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED_FROM_ELEMENT] =
-        "Exactly one creation failed from element";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_REFERENCE_CREATION_FAILED_FROM_ELEMENT] =
-        "Reference creation failed from element";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_ASSERTION_CREATION_FAILED_FROM_ELEMENT] =
-        "Assertion creation failed from element";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED] =
-        "All creation failed";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED] =
-        "Exactly one creation failed";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED] =
-        "Policy creation failed";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_NORMALIZATION_FAILED] =
-        "Normalization failed";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_WRONG_INPUT_FOR_MERGE] =
-        "Wrong input for merge";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_CROSS_PRODUCT_FAILED] =
-        "Cross product failed";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS] =
-        "No children policy components";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_URI_NOT_SPECIFIED] =
-        "Reference URI not specified";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_NO_ENTRY_FOR_THE_GIVEN_URI] =
-        "No entry for the given URI";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY] =
-        "Exactly one not found in normalized policy";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_IS_EMPTY] =
-        "Exactly one is empty";
-    axutil_error_messages
-        [AXIS2_ERROR_NEETHI_ALL_NOT_FOUND_WHILE_GETTING_CROSS_PRODUCT] =
-        "All not found while getting cross product";
-    axutil_error_messages[AXIS2_ERROR_NEETHI_UNKNOWN_ASSERTION] = 
-        "Unknown Assertion";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_ELEMENT_WITH_NO_NAMESPACE]
+        = "Element with no namespace";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED_FROM_ELEMENT]
+        = "Policy creation failed from element";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED_FROM_ELEMENT]
+        = "All creation failed from element";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED_FROM_ELEMENT]
+        = "Exactly one creation failed from element";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_REFERENCE_CREATION_FAILED_FROM_ELEMENT]
+        = "Reference creation failed from element";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_ASSERTION_CREATION_FAILED_FROM_ELEMENT]
+        = "Assertion creation failed from element";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED] = "All creation failed";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED]
+        = "Exactly one creation failed";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED] = "Policy creation failed";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_NORMALIZATION_FAILED] = "Normalization failed";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_WRONG_INPUT_FOR_MERGE] = "Wrong input for merge";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_CROSS_PRODUCT_FAILED] = "Cross product failed";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS]
+        = "No children policy components";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_URI_NOT_SPECIFIED] = "Reference URI not specified";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_NO_ENTRY_FOR_THE_GIVEN_URI]
+        = "No entry for the given URI";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY]
+        = "Exactly one not found in normalized policy";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_EXACTLYONE_IS_EMPTY] = "Exactly one is empty";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_ALL_NOT_FOUND_WHILE_GETTING_CROSS_PRODUCT]
+        = "All not found while getting cross product";
+    axutil_error_messages[AXIS2_ERROR_NEETHI_UNKNOWN_ASSERTION] = "Unknown Assertion";
 
     return AXIS2_SUCCESS;
 }
@@ -555,13 +460,13 @@
     axutil_allocator_t * allocator)
 {
     axutil_error_t *error;
-    if (!allocator)
+    if(!allocator)
         return NULL;
 
-    error = (axutil_error_t *) AXIS2_MALLOC(allocator, sizeof(axutil_error_t));
-    memset(error, 0,  sizeof(axutil_error_t));
+    error = (axutil_error_t *)AXIS2_MALLOC(allocator, sizeof(axutil_error_t));
+    memset(error, 0, sizeof(axutil_error_t));
 
-    if (!error)
+    if(!error)
         return NULL;
 
     error->allocator = allocator;
@@ -574,19 +479,18 @@
     const axutil_error_t * error)
 {
     const axis2_char_t *message = NULL;
-    if (error)
+    if(error)
     {
-        if (error->error_number > AXIS2_ERROR_NONE &&
-            error->error_number < AXUTIL_ERROR_MAX) /* TODO; This needs to be 
-            fixed to include module defined and user defined errors */
+        if(error->error_number > AXIS2_ERROR_NONE && error->error_number < AXUTIL_ERROR_MAX) /* TODO; This needs to be
+         fixed to include module defined and user defined errors */
             message = axutil_error_messages[error->error_number];
         else
         {
-            if (error->message)
+            if(error->message)
             {
                 message = error->message;
             }
-            else if (error->error_number == AXIS2_ERROR_NONE)
+            else if(error->error_number == AXIS2_ERROR_NONE)
             {
                 message = axutil_error_messages[AXIS2_ERROR_NONE];
             }
@@ -605,7 +509,7 @@
     axutil_error_t * error,
     axutil_error_codes_t error_number)
 {
-    if (!error)
+    if(!error)
         return AXIS2_FAILURE;
     error->error_number = error_number;
     return AXIS2_SUCCESS;
@@ -616,7 +520,7 @@
     axutil_error_t * error,
     axis2_status_codes_t status_code)
 {
-    if (!error)
+    if(!error)
         return AXIS2_FAILURE;
     error->status_code = status_code;
     return AXIS2_SUCCESS;
@@ -626,7 +530,7 @@
 axutil_error_get_status_code(
     axutil_error_t * error)
 {
-    if (error)
+    if(error)
         return error->status_code;
     else
         return AXIS2_CRITICAL_FAILURE;
@@ -637,12 +541,12 @@
     axutil_error_t * error,
     axis2_char_t * message)
 {
-    if (message && error)
+    if(message && error)
     {
         error->message = message;
         return AXIS2_SUCCESS;
     }
-    
+
     return AXIS2_FAILURE;
 }
 
@@ -650,11 +554,10 @@
 axutil_error_free(
     axutil_error_t * error)
 {
-    if (error)
+    if(error)
     {
         AXIS2_FREE(error->allocator, error);
     }
     return;
 }
 
-

Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Tue Aug 18 11:24:00 2009
@@ -33,10 +33,9 @@
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    file =
-        (axutil_file_t *) AXIS2_MALLOC(env->allocator, sizeof(axutil_file_t));
+    file = (axutil_file_t *)AXIS2_MALLOC(env->allocator, sizeof(axutil_file_t));
 
-    if (!file)
+    if(!file)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
@@ -54,17 +53,17 @@
     axutil_file_t *file,
     const axutil_env_t *env)
 {
-    if (file->name)
+    if(file->name)
     {
         AXIS2_FREE(env->allocator, file->name);
     }
 
-    if (file->path)
+    if(file->path)
     {
         AXIS2_FREE(env->allocator, file->path);
     }
 
-    if (file)
+    if(file)
     {
         AXIS2_FREE(env->allocator, file);
     }
@@ -79,13 +78,13 @@
 {
     AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
 
-    if (file->name)
+    if(file->name)
     {
         AXIS2_FREE(env->allocator, file->name);
         file->name = NULL;
     }
     file->name = axutil_strdup(env, name);
-    if (!file->name)
+    if(!file->name)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
@@ -99,10 +98,9 @@
     axutil_file_t *file,
     const axutil_env_t *env)
 {
-    if (!file->name)
+    if(!file->name)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
-            AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET, AXIS2_FAILURE);
         return NULL;
     }
     return (file->name);
@@ -114,18 +112,18 @@
     const axutil_env_t *env,
     axis2_char_t *path)
 {
-    if (!path)
+    if(!path)
     {
         return AXIS2_SUCCESS;
     }
 
-    if (file->path)
+    if(file->path)
     {
         AXIS2_FREE(env->allocator, file->path);
         file->path = NULL;
     }
     file->path = axutil_strdup(env, path);
-    if (!(file->path))
+    if(!(file->path))
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
@@ -139,10 +137,9 @@
     axutil_file_t *file,
     const axutil_env_t *env)
 {
-    if (!(file->path))
+    if(!(file->path))
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
-            AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET, AXIS2_FAILURE);
         return NULL;
     }
 
@@ -176,12 +173,12 @@
     axis2_status_t status = AXIS2_FAILURE;
     new_file = axutil_file_create(env);
     status = axutil_file_set_name(new_file, env, file->name);
-    if (AXIS2_SUCCESS != status)
+    if(AXIS2_SUCCESS != status)
     {
         return NULL;
     }
     status = axutil_file_set_path(new_file, env, file->path);
-    if (AXIS2_SUCCESS != status)
+    if(AXIS2_SUCCESS != status)
     {
         return NULL;
     }

Modified: webservices/axis2/trunk/c/util/src/file_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_handler.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/file_handler.c Tue Aug 18 11:24:00 2009
@@ -30,10 +30,10 @@
 {
     FILE *file_ptr;
 
-    if (!file_name)
+    if(!file_name)
         return NULL;
 
-    if (!options)
+    if(!options)
         return NULL;
 
     file_ptr = fopen(file_name, options);
@@ -46,7 +46,7 @@
 {
     int status = 0;
 
-    if (!file_ptr)
+    if(!file_ptr)
         return AXIS2_FAILURE;
 
     status = fclose(file_ptr);
@@ -67,11 +67,11 @@
     int i = 0;
     axis2_status_t status = AXIS2_FAILURE;
     i = AXIS2_ACCESS(path, mode);
-    if (0 == i)
+    if(0 == i)
     {
         status = AXIS2_SUCCESS;
     }
-    else if (-1 == i)
+    else if(-1 == i)
     {
         status = AXIS2_FAILURE;
     }
@@ -80,23 +80,24 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axutil_file_handler_copy(
-    FILE *from, 
+    FILE *from,
     FILE *to)
 {
     axis2_char_t ch;
-    
+
     /* It is assumed that source and destination files are accessible and open*/
-    while(!feof(from)) 
+    while(!feof(from))
     {
         ch = (axis2_char_t)fgetc(from);
         /* We are sure that the conversion is safe */
-        if(ferror(from)) 
+        if(ferror(from))
         {
             /* Error reading source file */
             return AXIS2_FAILURE;
         }
-        if(!feof(from)) fputc(ch, to);
-        if(ferror(to)) 
+        if(!feof(from))
+            fputc(ch, to);
+        if(ferror(to))
         {
             /* Error writing destination file */
             return AXIS2_FAILURE;
@@ -107,7 +108,7 @@
 
 AXIS2_EXTERN long AXIS2_CALL
 axutil_file_handler_size(
-    const axis2_char_t *const name)
+    const axis2_char_t * const name)
 {
     struct stat stbuf;
     if(stat(name, &stbuf) == -1)

Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Tue Aug 18 11:24:00 2009
@@ -31,10 +31,10 @@
     axutil_generic_obj_t *generic_obj = NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
-    generic_obj = (axutil_generic_obj_t *) AXIS2_MALLOC(env->allocator,
-                      sizeof(axutil_generic_obj_t));
+    generic_obj
+        = (axutil_generic_obj_t *)AXIS2_MALLOC(env->allocator, sizeof(axutil_generic_obj_t));
 
-    if (!generic_obj)
+    if(!generic_obj)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
@@ -51,9 +51,9 @@
     axutil_generic_obj_t *generic_obj,
     const axutil_env_t *env)
 {
-    if (generic_obj->value)
+    if(generic_obj->value)
     {
-        if (generic_obj->free_func)
+        if(generic_obj->free_func)
         {
             generic_obj->free_func(generic_obj->value, env);
         }
@@ -64,7 +64,7 @@
 
     }
 
-    if (generic_obj)
+    if(generic_obj)
     {
         AXIS2_FREE(env->allocator, generic_obj);
     }

Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Tue Aug 18 11:24:00 2009
@@ -49,8 +49,7 @@
 struct axutil_hash_index_t
 {
     axutil_hash_t *ht;
-    axutil_hash_entry_t *this,
-    *next;
+    axutil_hash_entry_t *this, *next;
     unsigned int index;
 };
 
@@ -65,11 +64,11 @@
 {
     const axutil_env_t *env;
     axutil_hash_entry_t **array;
-    axutil_hash_index_t iterator;   /* For axutil_hash_first(NULL, ...) */
+    axutil_hash_index_t iterator; /* For axutil_hash_first(NULL, ...) */
     unsigned int count;
     unsigned int max;
     axutil_hashfunc_t hash_func;
-    axutil_hash_entry_t *free;  /* List of recycled entries */
+    axutil_hash_entry_t *free; /* List of recycled entries */
 };
 
 #define INITIAL_MAX 15          /* tunable == 2^n - 1 */
@@ -83,9 +82,8 @@
     axutil_hash_t *ht,
     unsigned int max)
 {
-    return
-        memset(AXIS2_MALLOC(ht->env->allocator, sizeof(*ht->array) * (max + 1)),
-            0, sizeof(*ht->array) * (max + 1));
+    return memset(AXIS2_MALLOC(ht->env->allocator, sizeof(*ht->array) * (max + 1)), 0,
+        sizeof(*ht->array) * (max + 1));
 }
 
 AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
@@ -96,7 +94,7 @@
     AXIS2_ENV_CHECK(env, NULL);
 
     ht = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_t));
-    if (!ht)
+    if(!ht)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
@@ -119,7 +117,7 @@
     axutil_hash_t *ht;
     AXIS2_ENV_CHECK(env, NULL);
     ht = axutil_hash_make(env);
-    if (ht)
+    if(ht)
     {
         ht->hash_func = hash_func;
     }
@@ -136,11 +134,11 @@
     axutil_hash_index_t *hi)
 {
     hi->this = hi->next;
-    while (!hi->this)
+    while(!hi->this)
     {
-        if (hi->index > hi->ht->max)
+        if(hi->index > hi->ht->max)
         {
-            if (env)
+            if(env)
                 AXIS2_FREE(env->allocator, hi);
             return NULL;
         }
@@ -157,7 +155,7 @@
     const axutil_env_t *env)
 {
     axutil_hash_index_t *hi;
-    if (env)
+    if(env)
         hi = AXIS2_MALLOC(env->allocator, sizeof(*hi));
     else
         hi = &ht->iterator;
@@ -176,12 +174,12 @@
     axis2_ssize_t *klen,
     void **val)
 {
-    if (key)
+    if(key)
         *key = hi->this->key;
-    if (klen)
+    if(klen)
         *klen = hi->this->klen;
-    if (val)
-        *val = (void *) hi->this->val;
+    if(val)
+        *val = (void *)hi->this->val;
 }
 
 /*
@@ -199,7 +197,7 @@
 
     new_max = ht->max * 2 + 1;
     new_array = axutil_hash_alloc_array(ht, new_max);
-    for (hi = axutil_hash_first(ht, NULL); hi; hi = axutil_hash_next(NULL, hi))
+    for(hi = axutil_hash_first(ht, NULL); hi; hi = axutil_hash_next(NULL, hi))
     {
         unsigned int i = hi->this->hash & new_max;
         hi->this->next = new_array[i];
@@ -216,7 +214,7 @@
     axis2_ssize_t *klen)
 {
     unsigned int hash = 0;
-    const unsigned char *key = (const unsigned char *) char_key;
+    const unsigned char *key = (const unsigned char *)char_key;
     const unsigned char *p;
     axis2_ssize_t i;
 
@@ -258,9 +256,9 @@
      *                  -- Ralf S. Engelschall <rs...@engelschall.com>
      */
 
-    if (*klen == AXIS2_HASH_KEY_STRING)
+    if(*klen == AXIS2_HASH_KEY_STRING)
     {
-        for (p = key; *p; p++)
+        for(p = key; *p; p++)
         {
             hash = hash * 33 + *p;
         }
@@ -269,7 +267,7 @@
     }
     else
     {
-        for (p = key, i = *klen; i; i--, p++)
+        for(p = key, i = *klen; i; i--, p++)
         {
             hash = hash * 33 + *p;
         }
@@ -294,27 +292,24 @@
     axis2_ssize_t klen,
     const void *val)
 {
-    axutil_hash_entry_t **hep,
-    *he;
+    axutil_hash_entry_t **hep, *he;
     unsigned int hash;
 
     hash = ht->hash_func(key, &klen);
 
     /* scan linked list */
-    for (hep = &ht->array[hash & ht->max], he = *hep; he;
-         hep = &he->next, he = *hep)
+    for(hep = &ht->array[hash & ht->max], he = *hep; he; hep = &he->next, he = *hep)
     {
-        if (he->hash == hash && he->klen == klen &&
-            memcmp(he->key, key, klen) == 0)
+        if(he->hash == hash && he->klen == klen && memcmp(he->key, key, klen) == 0)
             break;
     }
 
-    if (he || !val)
+    if(he || !val)
         return hep;
 
     /* add a new entry for non-NULL values */
     he = ht->free;
-    if (he)
+    if(he)
         ht->free = he->next;
     else
         he = AXIS2_MALLOC(ht->env->allocator, sizeof(*he));
@@ -335,28 +330,26 @@
 {
     axutil_hash_t *ht;
     axutil_hash_entry_t *new_vals;
-    unsigned int i,
-     j;
+    unsigned int i, j;
 
-    ht = AXIS2_MALLOC(env->allocator,
-             sizeof(axutil_hash_t) + sizeof(*ht->array) * (orig->max + 1) +
-             sizeof(axutil_hash_entry_t) * orig->count);
+    ht = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_t) + sizeof(*ht->array) * (orig->max + 1)
+        + sizeof(axutil_hash_entry_t) * orig->count);
     ht->env = env;
     axutil_env_increment_ref((axutil_env_t*)env);
     ht->free = NULL;
     ht->count = orig->count;
     ht->max = orig->max;
     ht->hash_func = orig->hash_func;
-    ht->array = (axutil_hash_entry_t **) ((char *) ht + sizeof(axutil_hash_t));
+    ht->array = (axutil_hash_entry_t **)((char *)ht + sizeof(axutil_hash_t));
 
-    new_vals = (axutil_hash_entry_t *) ((char *) (ht) + sizeof(axutil_hash_t) +
-            sizeof(*ht->array) * (orig->max + 1));
+    new_vals = (axutil_hash_entry_t *)((char *)(ht) + sizeof(axutil_hash_t) + sizeof(*ht->array)
+        * (orig->max + 1));
     j = 0;
-    for (i = 0; i <= ht->max; i++)
+    for(i = 0; i <= ht->max; i++)
     {
         axutil_hash_entry_t **new_entry = &(ht->array[i]);
         axutil_hash_entry_t *orig_entry = orig->array[i];
-        while (orig_entry)
+        while(orig_entry)
         {
             *new_entry = &new_vals[j++];
             (*new_entry)->hash = orig_entry->hash;
@@ -379,8 +372,8 @@
 {
     axutil_hash_entry_t *he;
     he = *axutil_hash_find_entry(ht, key, klen, NULL);
-    if (he)
-        return (void *) he->val;
+    if(he)
+        return (void *)he->val;
     else
         return NULL;
 }
@@ -394,9 +387,9 @@
 {
     axutil_hash_entry_t **hep;
     hep = axutil_hash_find_entry(ht, key, klen, val);
-    if (*hep)
+    if(*hep)
     {
-        if (!val)
+        if(!val)
         {
             /* delete entry */
             axutil_hash_entry_t *old = *hep;
@@ -410,7 +403,7 @@
             /* replace entry */
             (*hep)->val = val;
             /* check that the collision rate isn't too high */
-            if (ht->count > ht->max)
+            if(ht->count > ht->max)
             {
                 axutil_hash_expand_array(ht);
             }
@@ -440,12 +433,14 @@
     const axutil_hash_t *overlay,
     const axutil_env_t *env,
     const axutil_hash_t *base,
-    void *(*merger) (const axutil_env_t *env,
-                     const void *key,
-                     axis2_ssize_t klen,
-                     const void *h1_val,
-                     const void *h2_val,
-                     const void *data),
+    void *
+    (*merger)(
+        const axutil_env_t *env,
+        const void *key,
+        axis2_ssize_t klen,
+        const void *h1_val,
+        const void *h2_val,
+        const void *data),
     const void *data)
 {
     axutil_hash_t *res;
@@ -480,14 +475,14 @@
     res->hash_func = base->hash_func;
     res->count = base->count;
     res->max = (overlay->max > base->max) ? overlay->max : base->max;
-    if (base->count + overlay->count > res->max)
+    if(base->count + overlay->count > res->max)
     {
         res->max = res->max * 2 + 1;
     }
     res->array = axutil_hash_alloc_array(res, res->max);
-    for (k = 0; k <= base->max; k++)
+    for(k = 0; k <= base->max; k++)
     {
-        for (iter = base->array[k]; iter; iter = iter->next)
+        for(iter = base->array[k]; iter; iter = iter->next)
         {
             i = iter->hash & res->max;
             new_vals = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_entry_t));
@@ -500,21 +495,18 @@
         }
     }
 
-    for (k = 0; k <= overlay->max; k++)
+    for(k = 0; k <= overlay->max; k++)
     {
-        for (iter = overlay->array[k]; iter; iter = iter->next)
+        for(iter = overlay->array[k]; iter; iter = iter->next)
         {
             i = iter->hash & res->max;
-            for (ent = res->array[i]; ent; ent = ent->next)
+            for(ent = res->array[i]; ent; ent = ent->next)
             {
-                if ((ent->klen == iter->klen) &&
-                    (memcmp(ent->key, iter->key, iter->klen) == 0))
+                if((ent->klen == iter->klen) && (memcmp(ent->key, iter->key, iter->klen) == 0))
                 {
-                    if (merger)
+                    if(merger)
                     {
-                        ent->val =
-                            (*merger) (env, iter->key, iter->klen, iter->val,
-                                ent->val, data);
+                        ent->val = (*merger)(env, iter->key, iter->klen, iter->val, ent->val, data);
                     }
                     else
                     {
@@ -523,7 +515,7 @@
                     break;
                 }
             }
-            if (!ent)
+            if(!ent)
             {
                 new_vals = AXIS2_MALLOC(env->allocator, sizeof(axutil_hash_entry_t));
                 new_vals->klen = iter->klen;
@@ -547,14 +539,14 @@
 {
     axutil_hash_index_t *i = NULL;
 
-    for (i = axutil_hash_first(ht, env); i; i = axutil_hash_next(env, i))
+    for(i = axutil_hash_first(ht, env); i; i = axutil_hash_next(env, i))
     {
         const void *v = NULL;
         const axis2_char_t *key_l = NULL;
 
         axutil_hash_this(i, &v, NULL, NULL);
-        key_l = (const axis2_char_t *) v;
-        if (0 == axutil_strcmp(key, key_l))
+        key_l = (const axis2_char_t *)v;
+        if(0 == axutil_strcmp(key, key_l))
             return AXIS2_TRUE;
     }
 
@@ -562,21 +554,21 @@
 }
 
 /*
-void
-axutil_hash_entry_free(
-    const axutil_env_t *env,
-    axutil_hash_entry_t *hash_entry)
-{
-    if (!hash_entry)
-        return;
-    if (hash_entry->next)
-    {
-        axutil_hash_entry_free(env, hash_entry->next);
-    }
-    AXIS2_FREE(env->allocator, hash_entry);
-    return;
-}
-*/
+ void
+ axutil_hash_entry_free(
+ const axutil_env_t *env,
+ axutil_hash_entry_t *hash_entry)
+ {
+ if (!hash_entry)
+ return;
+ if (hash_entry->next)
+ {
+ axutil_hash_entry_free(env, hash_entry->next);
+ }
+ AXIS2_FREE(env->allocator, hash_entry);
+ return;
+ }
+ */
 
 AXIS2_EXTERN void AXIS2_CALL
 axutil_hash_free(
@@ -584,13 +576,13 @@
     const axutil_env_t *env)
 {
     unsigned int i = 0;
-    if (ht)
+    if(ht)
     {
-        for (i = 0; i <= ht->max; i++)
+        for(i = 0; i <= ht->max; i++)
         {
             axutil_hash_entry_t *next = NULL;
             axutil_hash_entry_t *current = ht->array[i];
-            while (current)
+            while(current)
             {
                 next = current->next;
                 AXIS2_FREE(env->allocator, current);
@@ -598,11 +590,11 @@
                 current = next;
             }
         }
-        if (ht->free)
+        if(ht->free)
         {
             axutil_hash_entry_t *next = NULL;
             axutil_hash_entry_t *current = ht->free;
-            while (current)
+            while(current)
             {
                 next = current->next;
                 AXIS2_FREE(env->allocator, current);
@@ -610,18 +602,18 @@
                 current = next;
             }
         }
-        
-        if (ht->env)
+
+        if(ht->env)
         {
             /*since we now keep a ref count in env and incrementing it
              *inside hash_make we need to free the env.Depending on the
-              situation the env struct is freed or ref count will be 
-              decremented.*/
+             situation the env struct is freed or ref count will be
+             decremented.*/
 
             axutil_free_thread_env((axutil_env_t*)(ht->env));
             ht->env = NULL;
-        }    
-        
+        }
+
         AXIS2_FREE(env->allocator, (ht->array));
         AXIS2_FREE(env->allocator, ht);
     }
@@ -634,14 +626,14 @@
     const axutil_env_t *env)
 {
     unsigned int i = 0;
-    axutil_hash_t *ht = (axutil_hash_t *) ht_void;
-    if (ht)
+    axutil_hash_t *ht = (axutil_hash_t *)ht_void;
+    if(ht)
     {
-        for (i = 0; i < ht->max; i++)
+        for(i = 0; i < ht->max; i++)
         {
             axutil_hash_entry_t *next = NULL;
             axutil_hash_entry_t *current = ht->array[i];
-            while (current)
+            while(current)
             {
                 next = current->next;
                 AXIS2_FREE(env->allocator, current);
@@ -660,14 +652,14 @@
     const axutil_env_t * env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    if (ht)
+    if(ht)
     {
-        if (ht->env)
+        if(ht->env)
         {
             /*since we now keep a ref count in env and incrementing it
              *inside hash_make we need to free the env.Depending on the
-              situation the env struct is freed or ref count will be 
-              decremented.*/
+             situation the env struct is freed or ref count will be
+             decremented.*/
 
             axutil_free_thread_env((axutil_env_t*)(ht->env));
             ht->env = NULL;

Modified: webservices/axis2/trunk/c/util/src/http_chunked_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/http_chunked_stream.c?rev=805365&r1=805364&r2=805365&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/util/src/http_chunked_stream.c Tue Aug 18 11:24:00 2009
@@ -31,7 +31,8 @@
     axis2_bool_t chunk_started;
 };
 
-static axis2_status_t axutil_http_chunked_stream_start_chunk(
+static axis2_status_t
+axutil_http_chunked_stream_start_chunk(
     axutil_http_chunked_stream_t * chunked_stream,
     const axutil_env_t *env);
 
@@ -44,10 +45,10 @@
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK(env->error, stream, NULL);
 
-    chunked_stream = (axutil_http_chunked_stream_t *) AXIS2_MALLOC
-        (env->allocator, sizeof(axutil_http_chunked_stream_t));
+    chunked_stream = (axutil_http_chunked_stream_t *)AXIS2_MALLOC(env->allocator,
+        sizeof(axutil_http_chunked_stream_t));
 
-    if (!chunked_stream)
+    if(!chunked_stream)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
@@ -84,45 +85,42 @@
     int yet_to_read = 0;
     axutil_stream_t *stream = chunked_stream->stream;
 
-    if (!buffer)
+    if(!buffer)
     {
         return -1;
     }
-    if (!stream)
+    if(!stream)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM,
-            AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM, AXIS2_FAILURE);
         return -1;
     }
-    if (AXIS2_TRUE == chunked_stream->end_of_chunks)
+    if(AXIS2_TRUE == chunked_stream->end_of_chunks)
     {
         return 0;
     }
-    if (AXIS2_FALSE == chunked_stream->chunk_started)
+    if(AXIS2_FALSE == chunked_stream->chunk_started)
     {
         axutil_http_chunked_stream_start_chunk(chunked_stream, env);
     }
     yet_to_read = (int)count;
     /* We are sure that the difference lies within the int range */
-    while (AXIS2_FALSE == chunked_stream->end_of_chunks && yet_to_read > 0)
+    while(AXIS2_FALSE == chunked_stream->end_of_chunks && yet_to_read > 0)
     {
-        if (chunked_stream->unread_len < yet_to_read)
+        if(chunked_stream->unread_len < yet_to_read)
         {
-            len = axutil_stream_read(chunked_stream->stream, env,
-                (axis2_char_t *) buffer + count -
-                yet_to_read, chunked_stream->unread_len);
+            len = axutil_stream_read(chunked_stream->stream, env, (axis2_char_t *)buffer + count
+                - yet_to_read, chunked_stream->unread_len);
             yet_to_read -= len;
             chunked_stream->unread_len -= len;
-            if (chunked_stream->unread_len <= 0)
+            if(chunked_stream->unread_len <= 0)
             {
                 axutil_http_chunked_stream_start_chunk(chunked_stream, env);
             }
         }
         else
         {
-            len = axutil_stream_read(chunked_stream->stream, env,
-                (axis2_char_t *) buffer + count -
-                yet_to_read, yet_to_read);
+            len = axutil_stream_read(chunked_stream->stream, env, (axis2_char_t *)buffer + count
+                - yet_to_read, yet_to_read);
             yet_to_read -= len;
             chunked_stream->unread_len -= len;
         }
@@ -142,17 +140,16 @@
     int len = -1;
     axis2_char_t tmp_buf[10];
 
-    if (!buffer)
+    if(!buffer)
     {
         return -1;
     }
-    if (!stream)
+    if(!stream)
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM,
-            AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_STREAM_IN_CHUNKED_STREAM, AXIS2_FAILURE);
         return -1;
     }
-    sprintf(tmp_buf, "%x%s", (unsigned int) count, AXIS2_HTTP_CRLF);
+    sprintf(tmp_buf, "%x%s", (unsigned int)count, AXIS2_HTTP_CRLF);
     len = axutil_stream_write(stream, env, tmp_buf, axutil_strlen(tmp_buf));
     len = axutil_stream_write(stream, env, buffer, count);
     axutil_stream_write(stream, env, AXIS2_HTTP_CRLF, 2);
@@ -178,31 +175,30 @@
     int read = -1;
 
     /* remove the last CRLF of the previous chunk if any */
-    if (AXIS2_TRUE == chunked_stream->chunk_started)
+    if(AXIS2_TRUE == chunked_stream->chunk_started)
     {
         read = axutil_stream_read(chunked_stream->stream, env, tmp_buf, 2);
         chunked_stream->chunk_started = AXIS2_FALSE;
     }
     /* read the len and chunk extension */
-    while ((read = axutil_stream_read(chunked_stream->stream, env, tmp_buf,
-                                      1)) > 0)
+    while((read = axutil_stream_read(chunked_stream->stream, env, tmp_buf, 1)) > 0)
     {
         tmp_buf[read] = '\0';
         strcat(str_chunk_len, tmp_buf);
-        if (0 != strstr(str_chunk_len, AXIS2_HTTP_CRLF))
+        if(0 != strstr(str_chunk_len, AXIS2_HTTP_CRLF))
         {
             break;
         }
     }
     /* check whether we have extensions */
     tmp = strchr(str_chunk_len, ';');
-    if (tmp)
+    if(tmp)
     {
         /* we don't use extensions right now */
         *tmp = '\0';
     }
     chunked_stream->current_chunk_size = strtol(str_chunk_len, NULL, 16);
-    if (0 == chunked_stream->current_chunk_size)
+    if(0 == chunked_stream->current_chunk_size)
     {
         /* Read the last CRLF */
         read = axutil_stream_read(chunked_stream->stream, env, tmp_buf, 2);
@@ -224,7 +220,7 @@
     axutil_stream_t *stream = NULL;
 
     stream = chunked_stream->stream;
-    if (axutil_stream_write(stream, env, "0\r\n\r\n", 5) == 5)
+    if(axutil_stream_write(stream, env, "0\r\n\r\n", 5) == 5)
     {
         return AXIS2_SUCCESS;
     }
@@ -236,6 +232,6 @@
     axutil_http_chunked_stream_t *chunked_stream,
     const axutil_env_t *env)
 {
-    return chunked_stream->end_of_chunks; 
+    return chunked_stream->end_of_chunks;
 }