Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 9064 invoked from network); 1 Nov 2005 07:06:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Nov 2005 07:06:06 -0000 Received: (qmail 83388 invoked by uid 500); 1 Nov 2005 07:06:05 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 83366 invoked by uid 500); 1 Nov 2005 07:06:04 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 83355 invoked by uid 500); 1 Nov 2005 07:06:04 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 83352 invoked by uid 99); 1 Nov 2005 07:06:04 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 31 Oct 2005 23:06:03 -0800 Received: (qmail 8949 invoked by uid 65534); 1 Nov 2005 07:05:43 -0000 Message-ID: <20051101070543.8948.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r329995 - in /webservices/axis2/trunk/c/modules/core: context/src/ description/src/ engine/src/ Date: Tue, 01 Nov 2005 07:05:42 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Mon Oct 31 23:05:26 2005 New Revision: 329995 URL: http://svn.apache.org/viewcvs?rev=329995&view=rev Log: changes to reflect the changes in util Modified: webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c Modified: webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c (original) +++ webservices/axis2/trunk/c/modules/core/context/src/axis2_context_msg_context.c Mon Oct 31 23:05:26 2005 @@ -40,7 +40,7 @@ { if(!msg_ctx) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_context_msg_ctx_t *) msg_ctx->ops; @@ -51,18 +51,18 @@ { axis2_context_msg_ctx_ops_t *ops = NULL; axis2_context_msg_ctx_t *msg_ctx = - (axis2_context_msg_ctx_t *) axis2_malloc (env->allocator + (axis2_context_msg_ctx_t *) AXIS2_MALLOC (env->allocator , sizeof (axis2_context_msg_ctx_t)); if(!msg_ctx) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } - ops = (axis2_context_msg_ctx_ops_t *) axis2_malloc(env->allocator, + ops = (axis2_context_msg_ctx_ops_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_context_msg_ctx_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = axis2_context_msg_ctx_ops_free; Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c (original) +++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_operation.c Mon Oct 31 23:05:26 2005 @@ -85,7 +85,7 @@ { if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_operation_ops_t *) operation_desc->ops; @@ -96,18 +96,18 @@ { axis2_description_operation_ops_t *ops = NULL; axis2_description_operation_t *operation_desc = - (axis2_description_operation_t *) axis2_malloc (env->allocator + (axis2_description_operation_t *) AXIS2_MALLOC (env->allocator , sizeof (axis2_description_operation_t)); if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } - ops = (axis2_description_operation_ops_t *) axis2_malloc(env->allocator, + ops = (axis2_description_operation_ops_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_description_operation_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = axis2_description_operation_ops_free; @@ -131,7 +131,7 @@ axis2_description_param_include_create(env); if(!param_include) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -156,12 +156,12 @@ if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } if(!name) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } @@ -175,7 +175,7 @@ { if(operation_desc) { - axis2_free(env->allocator, operation_desc); + AXIS2_FREE(env->allocator, operation_desc); return AXIS2_SUCCESS; } return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED; @@ -203,13 +203,13 @@ { if(!operation_desc || !operation_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } - axis2_char_t *tempname = axis2_strdup(env->string, name); + axis2_char_t *tempname = axis2_strdup(name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -223,7 +223,7 @@ { if(!operation_desc || !operation_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } @@ -237,13 +237,13 @@ { if(!env || !operation_desc || !operation_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return AXIS2_FALSE; } - axis2_char_t *tempname = axis2_strdup(env->string, param_name); + axis2_char_t *tempname = axis2_strdup(param_name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return AXIS2_FALSE; } @@ -270,7 +270,7 @@ { if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return operation_desc->parent; @@ -281,7 +281,7 @@ { if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return operation_desc->name; @@ -295,7 +295,7 @@ { return AXIS2_ERROR_INVALID_NULL_PARAMETER; } - operation_desc->msg_exchange_pattern = axis2_strdup(env->string, pattern); + operation_desc->msg_exchange_pattern = axis2_strdup(pattern); if(!operation_desc->msg_exchange_pattern) return AXIS2_ERROR_NO_MEMORY; return AXIS2_SUCCESS; @@ -306,7 +306,7 @@ { if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return operation_desc->msg_exchange_pattern; @@ -331,7 +331,7 @@ { if(!operation_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return operation_desc->msg_receiver; Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original) +++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Mon Oct 31 23:05:26 2005 @@ -58,7 +58,7 @@ { if(!param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return param_include->ops; @@ -72,14 +72,14 @@ malloc(sizeof(axis2_description_param_include_t)); if(!param_include) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } axis2_description_param_include_ops_t *ops = malloc(sizeof(axis2_description_param_include_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = (axis2_description_param_include_free_t) @@ -97,7 +97,7 @@ param_include->params = axis2_hash_make (env); if(!param_include->params) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } param_include->is_locked = AXIS2_FALSE; @@ -142,11 +142,11 @@ { if(!param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_param_t *)(axis2_hash_get - (param_include->params, axis2_strdup(env->string, name) + (param_include->params, axis2_strdup(name) , AXIS2_HASH_KEY_STRING)); } @@ -156,7 +156,7 @@ { if(!param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return param_include->params; @@ -169,7 +169,7 @@ { axis2_description_param_t *param = (axis2_description_param_t *) (axis2_hash_get (param_include->params - , axis2_strdup(env->string, param_name) + , axis2_strdup(param_name) , AXIS2_HASH_KEY_STRING)); if(!param) Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c (original) +++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_parameter.c Mon Oct 31 23:05:26 2005 @@ -76,7 +76,7 @@ if(!param) { /* set error code*/ - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } return (axis2_description_param_ops_t *) param->ops; @@ -87,21 +87,21 @@ (axis2_env_t *env) { axis2_description_param_t *param - = (axis2_description_param_t *) axis2_malloc (env->allocator + = (axis2_description_param_t *) AXIS2_MALLOC (env->allocator , sizeof(axis2_description_param_t)); if(!param) { /* set the error code*/ - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } axis2_description_param_ops_t *ops - = (axis2_description_param_ops_t *) axis2_malloc (env->allocator + = (axis2_description_param_ops_t *) AXIS2_MALLOC (env->allocator , sizeof(axis2_description_param_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; - axis2_free(env->allocator, param); + env->error->error_number = AXIS2_ERROR_NO_MEMORY; + AXIS2_FREE(env->allocator, param); return NULL; } ops->free = axis2_description_param_ops_free; @@ -136,20 +136,20 @@ if(!param) { /* set the error code*/ - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; } - param->name = axis2_strdup (env->string, name); + param->name = axis2_strdup (name); if(!param->name) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; - axis2_free(env->allocator, param); + env->error->error_number = AXIS2_ERROR_NO_MEMORY; + AXIS2_FREE(env->allocator, param); } - param->value = axis2_strdup (env->string, value); + param->value = axis2_strdup (value); if(!param->value) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; - axis2_free(env->allocator, param); + env->error->error_number = AXIS2_ERROR_NO_MEMORY; + AXIS2_FREE(env->allocator, param); return NULL; } /*param->param_element = NULL;*/ @@ -165,7 +165,7 @@ { if(param) { - axis2_free(env->allocator, param); + AXIS2_FREE(env->allocator, param); return AXIS2_SUCCESS; } return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED; @@ -179,7 +179,7 @@ /* return the error code*/ return AXIS2_ERROR_INVALID_NULL_PARAMETER; } - param->name = axis2_strdup(env->string, name); + param->name = axis2_strdup(name); return AXIS2_SUCCESS; } @@ -189,7 +189,7 @@ if(!param) { /* set error code*/ - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return param->name; @@ -212,7 +212,7 @@ if(!param) { /* set error code*/ - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return param->value; @@ -223,7 +223,7 @@ { if(!param) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return AXIS2_ERROR_INVALID_NULL_PARAMETER; } return param->is_locked; @@ -258,7 +258,7 @@ { if(!param) { - env->error.errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error.error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_param_t *) param->param_element; Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c (original) +++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_service.c Mon Oct 31 23:05:26 2005 @@ -69,7 +69,7 @@ { if(!service_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return service_desc->ops; @@ -79,17 +79,17 @@ (axis2_env_t *env) { axis2_description_service_t *service_desc = (axis2_description_service_t *) - axis2_malloc (env->allocator, sizeof(axis2_description_service_t)); + AXIS2_MALLOC (env->allocator, sizeof(axis2_description_service_t)); if(!service_desc) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } axis2_description_service_ops_t *ops = (axis2_description_service_ops_t *) - axis2_malloc (env->allocator, sizeof(axis2_description_service_ops_t)); + AXIS2_MALLOC (env->allocator, sizeof(axis2_description_service_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = axis2_description_service_ops_free; @@ -112,7 +112,7 @@ axis2_description_param_include_create(env); if(!param_include) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -123,7 +123,7 @@ service_desc->wasaction_opeartionmap = axis2_hash_make (env); if(!service_desc->wasaction_opeartionmap) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } service_desc->name = NULL; @@ -138,10 +138,10 @@ axis2_description_service_create(env); if(!service_desc) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } - service_desc->name = axis2_strdup(env->string, qname); + service_desc->name = axis2_strdup(qname); return service_desc; } @@ -155,7 +155,7 @@ return AXIS2_ERROR_INVALID_NULL_PARAMETER; if(service_desc) { - axis2_free(env->allocator, service_desc); + AXIS2_FREE(env->allocator, service_desc); return AXIS2_SUCCESS; } return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED; @@ -201,7 +201,7 @@ { if(!service_desc || !service_desc->wasaction_opeartionmap) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_operation_t *) (axis2_hash_get @@ -217,12 +217,12 @@ { if(!service_desc || !service_desc->wasaction_opeartionmap) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_operation_t *) (axis2_hash_get (service_desc->wasaction_opeartionmap - , axis2_strdup(env->string, name), AXIS2_HASH_KEY_STRING)); + , axis2_strdup(name), AXIS2_HASH_KEY_STRING)); } axis2_hash_t *axis2_description_service_ops_get_operations @@ -230,7 +230,7 @@ { if(!service_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return service_desc->wasaction_opeartionmap; @@ -253,7 +253,7 @@ { if(!service_desc || !service_desc->parent) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return service_desc->parent; @@ -264,7 +264,7 @@ { if(!env || !service_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return service_desc->name; @@ -291,13 +291,13 @@ { if(!env || !service_desc || !service_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } - axis2_char_t *tempname = axis2_strdup(env->string, name); + axis2_char_t *tempname = axis2_strdup(name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -312,7 +312,7 @@ { if(!env || !service_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return axis2_description_param_include_get_params(env @@ -326,13 +326,13 @@ { if(!env || !service_desc || !service_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return AXIS2_FALSE; } - axis2_char_t *tempname = axis2_strdup(env->string, param_name); + axis2_char_t *tempname = axis2_strdup(param_name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return AXIS2_FALSE; } Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c (original) +++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_servicegroup.c Mon Oct 31 23:05:26 2005 @@ -84,7 +84,7 @@ { if(!env || !servicegroup_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return servicegroup_desc->ops; @@ -95,18 +95,18 @@ { axis2_description_servicegroup_t *servicegroup_desc = (axis2_description_servicegroup_t *) - axis2_malloc (env->allocator, sizeof(axis2_description_servicegroup_t)); + AXIS2_MALLOC (env->allocator, sizeof(axis2_description_servicegroup_t)); if(!servicegroup_desc) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } axis2_description_servicegroup_ops_t *ops = (axis2_description_servicegroup_ops_t *) - axis2_malloc (env->allocator, sizeof(axis2_description_servicegroup_ops_t)); + AXIS2_MALLOC (env->allocator, sizeof(axis2_description_servicegroup_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = axis2_description_servicegroup_ops_free; @@ -122,7 +122,7 @@ axis2_description_param_include_create(env); if(!param_include) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -133,7 +133,7 @@ servicegroup_desc->services = axis2_hash_make (env); if(!servicegroup_desc->services) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } servicegroup_desc->servicegroup_name = NULL; @@ -148,7 +148,7 @@ { if(!env || !servicegroup_desc) return AXIS2_ERROR_INVALID_NULL_PARAMETER; - axis2_free(env->allocator, servicegroup_desc); + AXIS2_FREE(env->allocator, servicegroup_desc); return AXIS2_SUCCESS; } @@ -159,7 +159,7 @@ { if(!env || !servicegroup_desc) return AXIS2_ERROR_INVALID_NULL_PARAMETER; - axis2_char_t *tempname = axis2_strdup(env->string, name); + axis2_char_t *tempname = axis2_strdup(name); if(!tempname) return AXIS2_ERROR_INVALID_NULL_PARAMETER; servicegroup_desc->servicegroup_name = name; return AXIS2_SUCCESS; @@ -171,7 +171,7 @@ { if(!env || !servicegroup_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return servicegroup_desc->servicegroup_name; @@ -198,7 +198,7 @@ { if(!env || !servicegroup_desc || ! service_name) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_service_t *) (axis2_hash_get @@ -243,13 +243,13 @@ { if(!env || !servicegroup_desc || !servicegroup_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } - axis2_char_t *tempname = axis2_strdup(env->string, name); + axis2_char_t *tempname = axis2_strdup(name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -265,7 +265,7 @@ { if(!env || !servicegroup_desc) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return axis2_description_param_include_get_params(env @@ -279,13 +279,13 @@ { if(!env || !servicegroup_desc || !servicegroup_desc->param_include) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return AXIS2_FALSE; } - axis2_char_t *tempname = axis2_strdup(env->string, param_name); + axis2_char_t *tempname = axis2_strdup(param_name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return AXIS2_FALSE; } Modified: webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_config.c Mon Oct 31 23:05:26 2005 @@ -68,7 +68,7 @@ if(!engine_config) { /* set error code*/ - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } return (axis2_engine_config_ops_t *) engine_config->ops; @@ -79,21 +79,21 @@ (axis2_env_t *env) { axis2_engine_config_t *engine_config - = (axis2_engine_config_t *) axis2_malloc (env->allocator + = (axis2_engine_config_t *) AXIS2_MALLOC (env->allocator , sizeof(axis2_engine_config_t)); if(!engine_config) { /* set the error code*/ - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } axis2_engine_config_ops_t *ops - = (axis2_engine_config_ops_t *) axis2_malloc (env->allocator + = (axis2_engine_config_ops_t *) AXIS2_MALLOC (env->allocator , sizeof(axis2_engine_config_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; - axis2_free(env->allocator, engine_config); + env->error->error_number = AXIS2_ERROR_NO_MEMORY; + AXIS2_FREE(env->allocator, engine_config); return NULL; } ops->free = axis2_engine_config_ops_free; @@ -108,7 +108,7 @@ axis2_description_param_include_create(env); if(!param_include) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } @@ -126,7 +126,7 @@ { if(engine_config) { - axis2_free(env->allocator, engine_config); + AXIS2_FREE(env->allocator, engine_config); } return AXIS2_ERROR_UNALLOCATED_MEMEORY_RELEASE_REQUESTED; } @@ -154,13 +154,13 @@ { if(!engine_config) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } - axis2_char_t *tempname = axis2_strdup(env->string, servicegroup_name); + axis2_char_t *tempname = axis2_strdup(servicegroup_name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_description_servicegroup_t *) (axis2_hash_get @@ -201,22 +201,22 @@ { if(!env || !engine_config) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } - axis2_char_t *tempname = axis2_strdup(env->string, service_name); + axis2_char_t *tempname = axis2_strdup(service_name); if(!tempname) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } axis2_description_servicegroup_t *sg = NULL; int len = strlen(service_name); axis2_char_t *service_st[2]; - service_st[1] = (axis2_char_t*) axis2_malloc + service_st[1] = (axis2_char_t*) AXIS2_MALLOC (env->allocator, len * sizeof(axis2_char_t)); - service_st[2] = (axis2_char_t*) axis2_malloc + service_st[2] = (axis2_char_t*) AXIS2_MALLOC (env->allocator, len * sizeof(axis2_char_t)); if(AXIS2_SUCCESS == split_service_name(env, service_name, service_st)) { @@ -240,16 +240,16 @@ { if(!env || !engine_config) return AXIS2_ERROR_INVALID_NULL_PARAMETER; - axis2_char_t *tempname = axis2_strdup(env->string, service_name); + axis2_char_t *tempname = axis2_strdup(service_name); if(!tempname) return AXIS2_ERROR_INVALID_NULL_PARAMETER; axis2_description_servicegroup_t *sg = NULL; int len = strlen(service_name); axis2_char_t *service_st[2]; - service_st[1] = (axis2_char_t*) axis2_malloc + service_st[1] = (axis2_char_t*) AXIS2_MALLOC (env->allocator, len * sizeof(axis2_char_t)); - service_st[2] = (axis2_char_t*) axis2_malloc + service_st[2] = (axis2_char_t*) AXIS2_MALLOC (env->allocator, len * sizeof(axis2_char_t)); if(AXIS2_SUCCESS == split_service_name(env, service_name, service_st)) @@ -293,7 +293,7 @@ return AXIS2_SUCCESS; } srv_name[0] = AXIS2_EOLN; - axis2_char_t *grp_name = axis2_malloc(env->allocator, strlen(service_name)); + axis2_char_t *grp_name = AXIS2_MALLOC(env->allocator, strlen(service_name)); sscanf(service_name, "%s", grp_name); srv_name = srv_name + 1; *(service_name_st + 1) = srv_name; Modified: webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c?rev=329995&r1=329994&r2=329995&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/src/axis2_engine_msg_receiver.c Mon Oct 31 23:05:26 2005 @@ -42,7 +42,7 @@ { if(!msg_receiver) { - env->error->errorno = AXIS2_ERROR_INVALID_NULL_PARAMETER; + env->error->error_number = AXIS2_ERROR_INVALID_NULL_PARAMETER; return NULL; } return (axis2_engine_msg_receiver_t *) msg_receiver->ops; @@ -53,18 +53,18 @@ { axis2_engine_msg_receiver_ops_t *ops = NULL; axis2_engine_msg_receiver_t *msg_receiver = - (axis2_engine_msg_receiver_t *) axis2_malloc (env->allocator + (axis2_engine_msg_receiver_t *) AXIS2_MALLOC (env->allocator , sizeof (axis2_engine_msg_receiver_t)); if(!msg_receiver) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } - ops = (axis2_engine_msg_receiver_ops_t *) axis2_malloc(env->allocator, + ops = (axis2_engine_msg_receiver_ops_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_engine_msg_receiver_ops_t)); if(!ops) { - env->error->errorno = AXIS2_ERROR_NO_MEMORY; + env->error->error_number = AXIS2_ERROR_NO_MEMORY; return NULL; } ops->free = axis2_engine_msg_receiver_ops_free;