You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/05/31 17:54:39 UTC
svn commit: r410566 [36/49] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
axiom/test/unit/om/ include/ modules/...
Modified: webservices/axis2/trunk/c/util/src/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/property.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/property.c (original)
+++ webservices/axis2/trunk/c/util/src/property.c Wed May 31 08:54:07 2006
@@ -30,42 +30,42 @@
axis2_status_t AXIS2_CALL
axis2_property_free (axis2_property_t *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_property_set_scope(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_scope_t scope);
axis2_status_t AXIS2_CALL
axis2_property_set_free_func(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_FREE_VOID_ARG free_func);
axis2_status_t AXIS2_CALL
axis2_property_set_value(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value);
void *AXIS2_CALL
axis2_property_get_value(axis2_property_t *property,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of function prototypes ************************/
axis2_property_t *AXIS2_CALL
-axis2_property_create(axis2_env_t **env)
+axis2_property_create(const axis2_env_t *env)
{
axis2_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- property_impl = (axis2_property_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ property_impl = (axis2_property_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_property_impl_t));
if(NULL == property_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
property_impl->value= NULL;
@@ -73,11 +73,11 @@
property_impl->free_func = 0;
property_impl->property.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_property_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_property_ops_t));
if(NULL == property_impl->property.ops)
{
axis2_property_free(&(property_impl->property), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -93,7 +93,7 @@
axis2_status_t AXIS2_CALL
axis2_property_free (axis2_property_t *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_property_impl_t *property_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -109,7 +109,7 @@
}
else
{
- AXIS2_FREE((*env)->allocator, property_impl->value);
+ AXIS2_FREE(env->allocator, property_impl->value);
}
property_impl->value = NULL;
}
@@ -117,13 +117,13 @@
if(property_impl->property.ops)
{
- AXIS2_FREE((*env)->allocator, property_impl->property.ops);
+ AXIS2_FREE(env->allocator, property_impl->property.ops);
property_impl->property.ops = NULL;
}
if(property_impl)
{
- AXIS2_FREE((*env)->allocator, property_impl);
+ AXIS2_FREE(env->allocator, property_impl);
property_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -131,7 +131,7 @@
axis2_status_t AXIS2_CALL
axis2_property_set_scope(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_scope_t scope)
{
axis2_property_impl_t *property_impl = NULL;
@@ -145,7 +145,7 @@
axis2_status_t AXIS2_CALL
axis2_property_set_free_func(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_FREE_VOID_ARG free_func)
{
axis2_property_impl_t *property_impl = NULL;
@@ -159,7 +159,7 @@
axis2_status_t AXIS2_CALL
axis2_property_set_value(axis2_property_t *property,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value)
{
axis2_property_impl_t *property_impl = NULL;
@@ -173,7 +173,7 @@
void *AXIS2_CALL
axis2_property_get_value(axis2_property_t *property,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_property_impl_t *property_impl = NULL;
Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Wed May 31 08:54:07 2006
@@ -24,33 +24,33 @@
axis2_status_t AXIS2_CALL
axis2_qname_free ( axis2_qname_t * qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_qname_equals (axis2_qname_t * qname,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t * qname1);
axis2_qname_t* AXIS2_CALL
axis2_qname_clone(axis2_qname_t *qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_qname_get_uri(axis2_qname_t *qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_qname_get_prefix(axis2_qname_t *qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_qname_get_localpart(axis2_qname_t *qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axis2_qname_to_string(axis2_qname_t *qname,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*************************************** qname struct *********************/
@@ -81,7 +81,7 @@
/************************************************************************/
AXIS2_DECLARE(axis2_qname_t *)
-axis2_qname_create (axis2_env_t **env,
+axis2_qname_create (const axis2_env_t *env,
const axis2_char_t * localpart,
const axis2_char_t * namespace_uri,
const axis2_char_t * prefix)
@@ -93,16 +93,16 @@
/* localpart can't be null */
if (!localpart)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_INVALID_NULL_PARAM);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return NULL;
}
- qn = (axis2_qname_impl_t *) AXIS2_MALLOC ((*env)->allocator,
+ qn = (axis2_qname_impl_t *) AXIS2_MALLOC (env->allocator,
sizeof (axis2_qname_impl_t));
if (!qn)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
/* set properties */
@@ -115,9 +115,9 @@
qn->localpart = (axis2_char_t *)AXIS2_STRDUP (localpart, env);
if (!(qn->localpart))
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
- AXIS2_FREE ((*env)->allocator, qn);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
+ AXIS2_FREE (env->allocator, qn);
return NULL;
}
/** if prefix is null it is set to "" */
@@ -131,10 +131,10 @@
}
if (!(qn->prefix))
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
- AXIS2_FREE ((*env)->allocator, qn->localpart);
- AXIS2_FREE ((*env)->allocator, qn);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
+ AXIS2_FREE (env->allocator, qn->localpart);
+ AXIS2_FREE (env->allocator, qn);
return NULL;
}
/** if uri is null it is set to ""*/
@@ -148,28 +148,28 @@
}
if (!(qn->namespace_uri))
{
- AXIS2_FREE ((*env)->allocator, qn->localpart);
- AXIS2_FREE ((*env)->allocator, qn->prefix);
- AXIS2_FREE ((*env)->allocator, qn);
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_FREE (env->allocator, qn->localpart);
+ AXIS2_FREE (env->allocator, qn->prefix);
+ AXIS2_FREE (env->allocator, qn);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return NULL;
}
qn->qname.ops = NULL;
- qn->qname.ops = (axis2_qname_ops_t*)AXIS2_MALLOC ((*env)->allocator,
+ qn->qname.ops = (axis2_qname_ops_t*)AXIS2_MALLOC (env->allocator,
sizeof (axis2_qname_ops_t));
if (!qn->qname.ops)
{
- AXIS2_FREE ((*env)->allocator, qn->localpart);
+ AXIS2_FREE (env->allocator, qn->localpart);
if (qn->namespace_uri)
- AXIS2_FREE ((*env)->allocator, qn->namespace_uri);
- AXIS2_FREE ((*env)->allocator, qn->prefix);
- AXIS2_FREE ((*env)->allocator, qn);
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_FREE (env->allocator, qn->namespace_uri);
+ AXIS2_FREE (env->allocator, qn->prefix);
+ AXIS2_FREE (env->allocator, qn);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return NULL;
}
@@ -187,7 +187,7 @@
axis2_status_t AXIS2_CALL
axis2_qname_free ( axis2_qname_t * qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_qname_impl_t *qname_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -195,29 +195,29 @@
if (qname_impl->localpart)
{
- AXIS2_FREE ((*env)->allocator, qname_impl->localpart);
+ AXIS2_FREE (env->allocator, qname_impl->localpart);
qname_impl->localpart = NULL;
}
if (qname_impl->namespace_uri)
{
- AXIS2_FREE ((*env)->allocator, qname_impl->namespace_uri);
+ AXIS2_FREE (env->allocator, qname_impl->namespace_uri);
qname_impl->namespace_uri = NULL;
}
if (qname_impl->prefix)
{
- AXIS2_FREE ((*env)->allocator, qname_impl->prefix);
+ AXIS2_FREE (env->allocator, qname_impl->prefix);
qname_impl->prefix = NULL;
}
if(qname_impl->qname_string)
{
- AXIS2_FREE((*env)->allocator, qname_impl->qname_string);
+ AXIS2_FREE(env->allocator, qname_impl->qname_string);
qname_impl->qname_string = NULL;
}
if (qname->ops)
{
- AXIS2_FREE ((*env)->allocator, qname->ops);
+ AXIS2_FREE (env->allocator, qname->ops);
}
- AXIS2_FREE ((*env)->allocator, qname_impl);
+ AXIS2_FREE (env->allocator, qname_impl);
return AXIS2_SUCCESS;
}
@@ -225,7 +225,7 @@
axis2_bool_t AXIS2_CALL
axis2_qname_equals (axis2_qname_t *qname,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t * qname1)
{
axis2_qname_impl_t *qn1 = NULL;
@@ -237,8 +237,8 @@
if (!qname1)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_INVALID_NULL_PARAM);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return AXIS2_FALSE;
}
@@ -272,7 +272,7 @@
axis2_qname_t* AXIS2_CALL
axis2_qname_clone(axis2_qname_t *qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_qname_impl_t *qname_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -286,7 +286,7 @@
axis2_char_t* AXIS2_CALL
axis2_qname_get_uri(axis2_qname_t *qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->namespace_uri;
@@ -294,7 +294,7 @@
axis2_char_t* AXIS2_CALL
axis2_qname_get_prefix(axis2_qname_t *qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->prefix;
@@ -303,7 +303,7 @@
axis2_char_t* AXIS2_CALL
axis2_qname_get_localpart(axis2_qname_t *qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env,NULL);
return AXIS2_INTF_TO_IMPL(qname)->localpart;
@@ -311,7 +311,7 @@
axis2_char_t* AXIS2_CALL
axis2_qname_to_string(axis2_qname_t *qname,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_qname_impl_t *qname_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -334,7 +334,7 @@
qname_impl->qname_string = AXIS2_STRACAT(temp_string1, qname_impl->namespace_uri, env);
if(NULL != temp_string1)
{
- AXIS2_FREE((*env)->allocator, temp_string1);
+ AXIS2_FREE(env->allocator, temp_string1);
temp_string1 = NULL;
}
}
@@ -352,17 +352,17 @@
if(NULL != temp_string1)
{
- AXIS2_FREE((*env)->allocator, temp_string1);
+ AXIS2_FREE(env->allocator, temp_string1);
temp_string1 = NULL;
}
if(NULL != temp_string2)
{
- AXIS2_FREE((*env)->allocator, temp_string2);
+ AXIS2_FREE(env->allocator, temp_string2);
temp_string2 = NULL;
}
if(NULL != temp_string3)
{
- AXIS2_FREE((*env)->allocator, temp_string3);
+ AXIS2_FREE(env->allocator, temp_string3);
temp_string3 = NULL;
}
}
@@ -370,7 +370,7 @@
}
AXIS2_DECLARE(axis2_qname_t*)
-axis2_qname_create_from_string(axis2_env_t **env,
+axis2_qname_create_from_string(const axis2_env_t *env,
const axis2_char_t *qstring)
{
axis2_char_t *localpart = NULL;
@@ -416,7 +416,7 @@
}
if(NULL != temp_string)
{
- AXIS2_FREE((*env)->allocator, temp_string);
+ AXIS2_FREE(env->allocator, temp_string);
temp_string = NULL;
}
return qn;
Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Wed May 31 08:54:07 2006
@@ -41,44 +41,44 @@
axis2_status_t AXIS2_CALL
axis2_stack_free(axis2_stack_t *stack,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_stack_pop(axis2_stack_t *stack,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_stack_push(axis2_stack_t *stack,
- axis2_env_t **env,
+ const axis2_env_t *env,
void* value);
int AXIS2_CALL
axis2_stack_size(axis2_stack_t *stack,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_stack_get(axis2_stack_t *stack,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_stack_get_at(axis2_stack_t *stack,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i);
AXIS2_DECLARE(axis2_stack_t *)
-axis2_stack_create(axis2_env_t **env)
+axis2_stack_create(const axis2_env_t *env)
{
axis2_stack_impl_t *stack_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- stack_impl = (axis2_stack_impl_t*)AXIS2_MALLOC((*env)->allocator,
+ stack_impl = (axis2_stack_impl_t*)AXIS2_MALLOC(env->allocator,
sizeof(axis2_stack_impl_t));
if(!stack_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -88,21 +88,21 @@
stack_impl->is_empty_stack = AXIS2_TRUE;
stack_impl->stack.ops = NULL;
- stack_impl->data = AXIS2_MALLOC((*env)->allocator, sizeof(void*)*
+ stack_impl->data = AXIS2_MALLOC(env->allocator, sizeof(void*)*
AXIS2_STACK_DEFAULT_CAPACITY);
if(NULL == stack_impl->data)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_stack_free(&(stack_impl->stack) , env);
return NULL;
}
- stack_impl->stack.ops = (axis2_stack_ops_t *)AXIS2_MALLOC((*env)->allocator,
+ stack_impl->stack.ops = (axis2_stack_ops_t *)AXIS2_MALLOC(env->allocator,
sizeof(axis2_stack_ops_t));
if(NULL == stack_impl->stack.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_stack_free(&(stack_impl->stack) , env);
return NULL;
}
@@ -131,7 +131,7 @@
axis2_status_t AXIS2_CALL
axis2_stack_free(axis2_stack_t *stack,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_stack_impl_t *stack_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -140,22 +140,22 @@
if(NULL != stack_impl->data)
{
- AXIS2_FREE((*env)->allocator, stack_impl->data);
+ AXIS2_FREE(env->allocator, stack_impl->data);
stack_impl->data = NULL;
}
if(NULL != stack->ops)
{
- AXIS2_FREE((*env)->allocator, stack->ops);
+ AXIS2_FREE(env->allocator, stack->ops);
stack->ops = NULL;
}
- AXIS2_FREE((*env)->allocator, stack_impl);
+ AXIS2_FREE(env->allocator, stack_impl);
stack_impl = NULL;
return AXIS2_SUCCESS;
}
void* AXIS2_CALL
axis2_stack_pop(axis2_stack_t *stack,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_stack_impl_t *stack_impl = NULL;
void *value = NULL;
@@ -182,12 +182,12 @@
axis2_status_t AXIS2_CALL
axis2_stack_push(axis2_stack_t *stack,
- axis2_env_t **env,
+ const axis2_env_t *env,
void* value)
{
axis2_stack_impl_t *stack_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, value, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
stack_impl = AXIS2_INTF_TO_IMPL(stack);
if((stack_impl->size < stack_impl->capacity) && (stack_impl->capacity >0 ))
@@ -200,17 +200,17 @@
int new_capacity = stack_impl->capacity + AXIS2_STACK_DEFAULT_CAPACITY;
- new_data = AXIS2_MALLOC((*env)->allocator, sizeof(void*)*new_capacity);
+ new_data = AXIS2_MALLOC(env->allocator, sizeof(void*)*new_capacity);
if(!new_data)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
memset(new_data, 0, sizeof(void*)*new_capacity);
memcpy(new_data, stack_impl->data, sizeof(void*) *(stack_impl->capacity));
stack_impl->capacity = new_capacity;
- AXIS2_FREE((*env)->allocator, stack_impl->data);
+ AXIS2_FREE(env->allocator, stack_impl->data);
stack_impl->data = NULL;
stack_impl->data = new_data;
@@ -222,7 +222,7 @@
int AXIS2_CALL
axis2_stack_size(axis2_stack_t *stack,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(stack)->size;
@@ -230,7 +230,7 @@
void * AXIS2_CALL
axis2_stack_get(axis2_stack_t *stack,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_stack_impl_t *stack_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -244,7 +244,7 @@
void* AXIS2_CALL
axis2_stack_get_at(axis2_stack_t *stack,
- axis2_env_t **env,
+ const axis2_env_t *env,
int i)
{
axis2_stack_impl_t *stack_impl = NULL;
Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Wed May 31 08:54:07 2006
@@ -42,100 +42,100 @@
/********************************Function headers******************************/
axis2_status_t AXIS2_CALL
-axis2_stream_free (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_free (axis2_stream_t *stream, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_stream_free_void_arg (void *stream,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_stream_type_t AXIS2_CALL
-axis2_stream_get_type (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_type (axis2_stream_t *stream, const axis2_env_t *env);
/** basic stream operatons **/
int AXIS2_CALL
-axis2_stream_write_basic(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_basic(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_read_basic (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_basic (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_get_len_basic (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_len_basic (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_skip_basic (axis2_stream_t *stream, axis2_env_t **env, int count);
+axis2_stream_skip_basic (axis2_stream_t *stream, const axis2_env_t *env, int count);
int AXIS2_CALL
-axis2_stream_get_char_basic (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_char_basic (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_unget_char_basic (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_basic (axis2_stream_t *stream, const axis2_env_t *env,
int ch);
/** file stream operations **/
int AXIS2_CALL
-axis2_stream_write_file(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_file(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_read_file (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_file (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_get_len_file (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_len_file (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_skip_file (axis2_stream_t *stream, axis2_env_t **env, int count);
+axis2_stream_skip_file (axis2_stream_t *stream, const axis2_env_t *env, int count);
int AXIS2_CALL
-axis2_stream_get_char_file (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_char_file (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_unget_char_file (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_file (axis2_stream_t *stream, const axis2_env_t *env,
int ch);
/** socket stream operations **/
int AXIS2_CALL
-axis2_stream_write_socket(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_socket(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_read_socket (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_socket (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count);
int AXIS2_CALL
-axis2_stream_get_len_socket (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_len_socket (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_skip_socket (axis2_stream_t *stream, axis2_env_t **env, int count);
+axis2_stream_skip_socket (axis2_stream_t *stream, const axis2_env_t *env, int count);
int AXIS2_CALL
-axis2_stream_get_char_socket (axis2_stream_t *stream, axis2_env_t **env);
+axis2_stream_get_char_socket (axis2_stream_t *stream, const axis2_env_t *env);
int AXIS2_CALL
-axis2_stream_unget_char_socket (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_socket (axis2_stream_t *stream, const axis2_env_t *env,
int ch);
/************************* End of function headers ****************************/
/*
* Internal function. Not exposed to outside
*/
AXIS2_DECLARE(axis2_stream_t *)
-axis2_stream_create_internal (axis2_env_t **env)
+axis2_stream_create_internal (const axis2_env_t *env)
{
axis2_stream_impl_t *stream_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
stream_impl = (axis2_stream_impl_t *)AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_stream_impl_t));
+ env->allocator, sizeof(axis2_stream_impl_t));
if(NULL == stream_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stream_impl->buffer = NULL;
stream_impl->fp = NULL;
stream_impl->socket = -1;
stream_impl->stream.ops = (axis2_stream_ops_t *) AXIS2_MALLOC (
- (*env)->allocator, sizeof (axis2_stream_ops_t));
+ env->allocator, sizeof (axis2_stream_ops_t));
if (NULL == stream_impl->stream.ops)
{
axis2_stream_free(&(stream_impl->stream), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stream_impl->stream.axis2_eof = EOF;
@@ -148,7 +148,7 @@
axis2_status_t AXIS2_CALL
-axis2_stream_free (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_free (axis2_stream_t *stream, const axis2_env_t *env)
{
axis2_stream_impl_t *stream_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -161,7 +161,7 @@
{
if(NULL != stream_impl->buffer)
{
- AXIS2_FREE((*env)->allocator, stream_impl->buffer);
+ AXIS2_FREE(env->allocator, stream_impl->buffer);
}
stream_impl->buffer = NULL;
stream_impl->len = -1;
@@ -188,16 +188,16 @@
if (NULL != stream_impl->stream.ops)
{
- AXIS2_FREE ((*env)->allocator, stream_impl->stream.ops);
+ AXIS2_FREE (env->allocator, stream_impl->stream.ops);
}
- AXIS2_FREE((*env)->allocator, stream_impl);
+ AXIS2_FREE(env->allocator, stream_impl);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_stream_free_void_arg (void *stream,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_stream_t *stream_l = NULL;
@@ -207,7 +207,7 @@
}
axis2_stream_type_t AXIS2_CALL
-axis2_stream_get_type (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_type (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(stream)->stream_type;
@@ -215,7 +215,7 @@
/************************ Basic Stream Operations *****************************/
AXIS2_DECLARE(axis2_stream_t *)
-axis2_stream_create_basic (axis2_env_t **env)
+axis2_stream_create_basic (const axis2_env_t *env)
{
axis2_stream_t *def_stream = NULL;
axis2_stream_impl_t *stream_impl = NULL;
@@ -238,7 +238,7 @@
stream_impl->stream.ops->skip = axis2_stream_skip_basic;
stream_impl->stream.ops->get_char = axis2_stream_get_char_basic;
stream_impl->stream.ops->unget_char = axis2_stream_unget_char_basic;
- stream_impl->buffer = (axis2_char_t*)AXIS2_MALLOC((*env)->allocator,
+ stream_impl->buffer = (axis2_char_t*)AXIS2_MALLOC(env->allocator,
AXIS2_STREAM_DEFAULT_BUF_SIZE*sizeof(axis2_char_t));
stream_impl->len = 0;
stream_impl->max_len = AXIS2_STREAM_DEFAULT_BUF_SIZE;
@@ -253,7 +253,7 @@
int AXIS2_CALL
-axis2_stream_read_basic (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_basic (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count)
{
int len = 0;
@@ -291,7 +291,7 @@
}
int AXIS2_CALL
-axis2_stream_write_basic(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_basic(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count)
{
axis2_stream_impl_t *stream_impl = NULL;
@@ -305,12 +305,12 @@
new_len = stream_impl->len + count;
if(new_len > stream_impl->max_len)
{
- axis2_char_t *tmp = (axis2_char_t *)AXIS2_MALLOC((*env)->allocator,
+ axis2_char_t *tmp = (axis2_char_t *)AXIS2_MALLOC(env->allocator,
sizeof(axis2_char_t)*(new_len +
AXIS2_STREAM_DEFAULT_BUF_SIZE));
if(NULL == tmp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return -1;
}
@@ -320,7 +320,7 @@
*/
stream_impl->max_len = new_len + AXIS2_STREAM_DEFAULT_BUF_SIZE;
memcpy(tmp, stream_impl->buffer, sizeof(axis2_char_t)*stream_impl->len);
- AXIS2_FREE((*env)->allocator, stream_impl->buffer);
+ AXIS2_FREE(env->allocator, stream_impl->buffer);
stream_impl->buffer = tmp;
}
memcpy(stream_impl->buffer + (stream_impl->len * sizeof(axis2_char_t)),
@@ -331,14 +331,14 @@
int AXIS2_CALL
-axis2_stream_get_len_basic (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_len_basic (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(stream)->len;
}
int AXIS2_CALL
-axis2_stream_skip_basic (axis2_stream_t *stream, axis2_env_t **env, int count)
+axis2_stream_skip_basic (axis2_stream_t *stream, const axis2_env_t *env, int count)
{
axis2_stream_impl_t *stream_impl = NULL;
int del_len = 0;
@@ -365,7 +365,7 @@
}
int AXIS2_CALL
-axis2_stream_get_char_basic (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_char_basic (axis2_stream_t *stream, const axis2_env_t *env)
{
axis2_char_t *buf = NULL;
int ret = -1;
@@ -384,7 +384,7 @@
}
int AXIS2_CALL
-axis2_stream_unget_char_basic (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_basic (axis2_stream_t *stream, const axis2_env_t *env,
int ch)
{
axis2_stream_impl_t *stream_impl = NULL;
@@ -396,12 +396,12 @@
new_len = stream_impl->len + 1;
if(new_len > stream_impl->max_len)
{
- tmp = (axis2_char_t *)AXIS2_MALLOC((*env)->allocator,
+ tmp = (axis2_char_t *)AXIS2_MALLOC(env->allocator,
sizeof(axis2_char_t)*(new_len +
AXIS2_STREAM_DEFAULT_BUF_SIZE));
if(NULL == tmp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return -1;
}
@@ -412,7 +412,7 @@
stream_impl->max_len = new_len + AXIS2_STREAM_DEFAULT_BUF_SIZE;
memcpy(tmp + 1, stream_impl->buffer,
sizeof(axis2_char_t)*stream_impl->len);
- AXIS2_FREE((*env)->allocator, stream_impl->buffer);
+ AXIS2_FREE(env->allocator, stream_impl->buffer);
stream_impl->buffer = tmp;
}
tmp[0] = ch;
@@ -422,7 +422,7 @@
/************************** File Stream Operations ****************************/
AXIS2_DECLARE(axis2_stream_t *)
-axis2_stream_create_file (axis2_env_t **env, FILE *fp)
+axis2_stream_create_file (const axis2_env_t *env, FILE *fp)
{
axis2_stream_t *def_stream = NULL;
axis2_stream_impl_t *stream_impl = NULL;
@@ -453,7 +453,7 @@
int AXIS2_CALL
-axis2_stream_read_file (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_file (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count)
{
FILE *fp = NULL;
@@ -461,7 +461,7 @@
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
return -1;
}
fp = AXIS2_INTF_TO_IMPL(stream)->fp;
@@ -473,7 +473,7 @@
}
int AXIS2_CALL
-axis2_stream_write_file(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_file(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count)
{
int len = 0;
@@ -481,7 +481,7 @@
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
return -1;
}
fp = AXIS2_INTF_TO_IMPL(stream)->fp;
@@ -494,14 +494,14 @@
int AXIS2_CALL
-axis2_stream_get_len_file (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_len_file (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return -1;
}
int AXIS2_CALL
-axis2_stream_skip_file (axis2_stream_t *stream, axis2_env_t **env, int count)
+axis2_stream_skip_file (axis2_stream_t *stream, const axis2_env_t *env, int count)
{
axis2_stream_impl_t *stream_impl = NULL;
axis2_char_t c = -1;
@@ -509,7 +509,7 @@
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
return -1;
}
while(EOF != (c = fgetc(stream_impl->fp)) && i > 0)
@@ -520,25 +520,25 @@
}
int AXIS2_CALL
-axis2_stream_get_char_file (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_char_file (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
return -1;
}
return fgetc(AXIS2_INTF_TO_IMPL(stream)->fp);
}
int AXIS2_CALL
-axis2_stream_unget_char_file (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_file (axis2_stream_t *stream, const axis2_env_t *env,
int ch)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(NULL == AXIS2_INTF_TO_IMPL(stream)->fp)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_FD, AXIS2_FAILURE);
return -1;
}
return ungetc(ch, AXIS2_INTF_TO_IMPL(stream)->fp);
@@ -547,7 +547,7 @@
/************************** Socket Stream Operations **************************/
AXIS2_DECLARE(axis2_stream_t *)
-axis2_stream_create_socket (axis2_env_t **env, int socket)
+axis2_stream_create_socket (const axis2_env_t *env, int socket)
{
axis2_stream_t *def_stream = NULL;
axis2_stream_impl_t *stream_impl = NULL;
@@ -580,7 +580,7 @@
int AXIS2_CALL
-axis2_stream_read_socket (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_read_socket (axis2_stream_t *stream, const axis2_env_t *env,
void *buffer, size_t count)
{
int len = 0;
@@ -592,7 +592,7 @@
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return -1;
}
@@ -606,14 +606,14 @@
#ifdef AXIS2_TCPMON
if (len > 1)
{
- temp = (axis2_char_t *)AXIS2_MALLOC((*env)->allocator,
+ temp = (axis2_char_t *)AXIS2_MALLOC(env->allocator,
(len + 1) * sizeof(axis2_char_t));
if (temp)
{
memcpy(temp, buffer, len * sizeof(axis2_char_t));
temp[len] = '\0';
fprintf (stderr, "%s", temp);
- AXIS2_FREE((*env)->allocator, temp);
+ AXIS2_FREE(env->allocator, temp);
temp = NULL;
}
}
@@ -622,7 +622,7 @@
}
int AXIS2_CALL
-axis2_stream_write_socket(axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_write_socket(axis2_stream_t *stream, const axis2_env_t *env,
const void *buffer, size_t count)
{
int len = 0;
@@ -634,7 +634,7 @@
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return -1;
}
@@ -644,14 +644,14 @@
#ifdef AXIS2_TCPMON
if (len > 0)
{
- temp = (axis2_char_t *)AXIS2_MALLOC((*env)->allocator,
+ temp = (axis2_char_t *)AXIS2_MALLOC(env->allocator,
(len + 1) * sizeof(axis2_char_t));
if (temp)
{
memcpy(temp, buffer, len * sizeof(axis2_char_t));
temp[len] = '\0';
fprintf (stderr, "%s", temp);
- AXIS2_FREE((*env)->allocator, temp);
+ AXIS2_FREE(env->allocator, temp);
temp = NULL;
}
}
@@ -662,14 +662,14 @@
int AXIS2_CALL
-axis2_stream_get_len_socket (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_len_socket (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return -1;
}
int AXIS2_CALL
-axis2_stream_skip_socket (axis2_stream_t *stream, axis2_env_t **env, int count)
+axis2_stream_skip_socket (axis2_stream_t *stream, const axis2_env_t *env, int count)
{
int len = 0;
char buffer[2];
@@ -678,7 +678,7 @@
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return -1;
}
@@ -690,12 +690,12 @@
}
int AXIS2_CALL
-axis2_stream_get_char_socket (axis2_stream_t *stream, axis2_env_t **env)
+axis2_stream_get_char_socket (axis2_stream_t *stream, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return -1;
}
@@ -703,13 +703,13 @@
}
int AXIS2_CALL
-axis2_stream_unget_char_socket (axis2_stream_t *stream, axis2_env_t **env,
+axis2_stream_unget_char_socket (axis2_stream_t *stream, const axis2_env_t *env,
int ch)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(-1 == AXIS2_INTF_TO_IMPL(stream)->socket)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return -1;
}
Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Wed May 31 08:54:07 2006
@@ -22,17 +22,17 @@
#include <ctype.h>
AXIS2_DECLARE(void*)
-axis2_strdup (const void *ptr, axis2_env_t **env)
+axis2_strdup (const void *ptr, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if (ptr)
{
int len = strlen(ptr);
- axis2_char_t * str = (axis2_char_t *) AXIS2_MALLOC( (*env)->allocator,
+ axis2_char_t * str = (axis2_char_t *) AXIS2_MALLOC( env->allocator,
sizeof(axis2_char_t) * (len + 1 ));
if (!str)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
memcpy(str, ptr, len + 1);
@@ -45,7 +45,7 @@
}
AXIS2_DECLARE(axis2_char_t*)
-axis2_stracat(const axis2_char_t *s1, const axis2_char_t *s2, axis2_env_t **env)
+axis2_stracat(const axis2_char_t *s1, const axis2_char_t *s2, const axis2_env_t *env)
{
axis2_char_t *ret = NULL;
int alloc_len = -1;
@@ -63,7 +63,7 @@
return (axis2_char_t*)AXIS2_STRDUP(s1, env);
}
alloc_len = axis2_strlen(s1) + axis2_strlen(s2) + 1;
- ret = (axis2_char_t*)AXIS2_MALLOC((*env)->allocator,
+ ret = (axis2_char_t*)AXIS2_MALLOC(env->allocator,
alloc_len*sizeof(axis2_char_t));
memcpy(ret, s1, axis2_strlen(s1)*sizeof(axis2_char_t));
memcpy((ret + axis2_strlen(s1)*sizeof(axis2_char_t)), s2,
Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Wed May 31 08:54:07 2006
@@ -19,7 +19,7 @@
#include <axis2_utils.h>
AXIS2_DECLARE(axis2_array_list_t *)
-axis2_tokenize(axis2_env_t **env,
+axis2_tokenize(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
@@ -65,7 +65,7 @@
}
AXIS2_DECLARE(axis2_array_list_t *)
-axis2_first_token(axis2_env_t **env,
+axis2_first_token(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
@@ -102,7 +102,7 @@
}
AXIS2_DECLARE(axis2_array_list_t *)
-axis2_last_token(axis2_env_t **env,
+axis2_last_token(const axis2_env_t *env,
axis2_char_t *in,
int delim)
{
Modified: webservices/axis2/trunk/c/util/src/thread_pool.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/thread_pool.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/thread_pool.c (original)
+++ webservices/axis2/trunk/c/util/src/thread_pool.c Wed May 31 08:54:07 2006
@@ -157,11 +157,11 @@
}
AXIS2_DECLARE (axis2_env_t *)
-axis2_init_thread_env(axis2_env_t **system_env)
+axis2_init_thread_env(const axis2_env_t *system_env)
{
- axis2_error_t *error = axis2_error_create((*system_env)->allocator);
- return axis2_env_create_with_error_log_thread_pool((*system_env)->allocator, error,
- (*system_env)->log, (*system_env)->thread_pool);
+ axis2_error_t *error = axis2_error_create(system_env->allocator);
+ return axis2_env_create_with_error_log_thread_pool(system_env->allocator, error,
+ system_env->log, system_env->thread_pool);
}
Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Wed May 31 08:54:07 2006
@@ -41,46 +41,46 @@
/***************************** Function headers *******************************/
axis2_char_t* AXIS2_CALL
-axis2_url_to_external_form (axis2_url_t *url, axis2_env_t **env);
+axis2_url_to_external_form (axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_set_protocol(axis2_url_t *url, axis2_env_t **env,
+axis2_url_set_protocol(axis2_url_t *url, const axis2_env_t *env,
axis2_char_t *protocol);
axis2_char_t* AXIS2_CALL
-axis2_url_get_protocol (axis2_url_t *url, axis2_env_t **env);
+axis2_url_get_protocol (axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_set_server(axis2_url_t *url,axis2_env_t **env, axis2_char_t *server);
+axis2_url_set_server(axis2_url_t *url,const axis2_env_t *env, axis2_char_t *server);
axis2_char_t* AXIS2_CALL
-axis2_url_get_server(axis2_url_t *url, axis2_env_t **env);
+axis2_url_get_server(axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_set_port(axis2_url_t *url, axis2_env_t **env, int port);
+axis2_url_set_port(axis2_url_t *url, const axis2_env_t *env, int port);
int AXIS2_CALL
-axis2_url_get_port (axis2_url_t *url, axis2_env_t **env);
+axis2_url_get_port (axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_set_path(axis2_url_t *url, axis2_env_t **env, axis2_char_t *path);
+axis2_url_set_path(axis2_url_t *url, const axis2_env_t *env, axis2_char_t *path);
axis2_char_t* AXIS2_CALL
-axis2_url_get_path(axis2_url_t *url, axis2_env_t **env);
+axis2_url_get_path(axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_free (axis2_url_t *url, axis2_env_t **env);
+axis2_url_free (axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_open (axis2_url_t *url, axis2_env_t **env);
+axis2_url_open (axis2_url_t *url, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_url_close (axis2_url_t *url, axis2_env_t **env);
+axis2_url_close (axis2_url_t *url, const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_DECLARE(axis2_url_t *)
-axis2_url_create (axis2_env_t **env, axis2_char_t *protocol,
+axis2_url_create (const axis2_env_t *env, axis2_char_t *protocol,
axis2_char_t *server, int port, axis2_char_t *path)
{
axis2_url_impl_t *url_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, protocol, NULL);
+ AXIS2_PARAM_CHECK(env->error, protocol, NULL);
- url_impl = (axis2_url_impl_t *)AXIS2_MALLOC ((*env)->allocator,
+ url_impl = (axis2_url_impl_t *)AXIS2_MALLOC (env->allocator,
sizeof(axis2_url_impl_t));
if(NULL == url_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
url_impl->protocol = AXIS2_STRDUP(protocol, env);
@@ -107,11 +107,11 @@
}
- url_impl->url.ops = AXIS2_MALLOC((*env)->allocator,sizeof(axis2_url_ops_t));
+ url_impl->url.ops = AXIS2_MALLOC(env->allocator,sizeof(axis2_url_ops_t));
if(NULL == url_impl->url.ops)
{
axis2_url_free((axis2_url_t*)url_impl, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -130,7 +130,7 @@
}
axis2_url_t * AXIS2_CALL
-axis2_url_parse_string(axis2_env_t **env, axis2_char_t *str_url)
+axis2_url_parse_string(const axis2_env_t *env, axis2_char_t *str_url)
{
/**
* Only accepted format is :
@@ -149,7 +149,7 @@
int port = -1;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, str_url, NULL);
+ AXIS2_PARAM_CHECK(env->error, str_url, NULL);
tmp_url_str = AXIS2_STRDUP(str_url, env);
if(NULL == tmp_url_str)
@@ -160,25 +160,25 @@
server = strstr(tmp_url_str, "://");
if(NULL == server)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_ADDRESS,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
AXIS2_FAILURE);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
if(AXIS2_STRLEN(server) < 3 * sizeof(axis2_char_t))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_ADDRESS,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
AXIS2_FAILURE);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
*server = '\0';
server += 3 * sizeof(axis2_char_t); /* skip "://" part */
if(AXIS2_STRLEN(server) <= 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_ADDRESS,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
AXIS2_FAILURE);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return NULL;
}
/* if the url is file:// thing we need the protocol and
@@ -187,7 +187,7 @@
if(0 == AXIS2_STRCASECMP(protocol, "file"))
{
ret = axis2_url_create(env, protocol, NULL, 0, server);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
port_str = strchr(server, ':');
@@ -216,7 +216,7 @@
}
/* here we have protocol + server + def port + def path */
ret = axis2_url_create(env, protocol, server, port, "/");
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
else
@@ -229,7 +229,7 @@
}
/* here we have protocol + server + def port + path */
ret = axis2_url_create(env, protocol, server, port, path);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
}
@@ -247,7 +247,7 @@
port = AXIS2_ATOI(port_str);
/* here we have protocol + server + port + def path */
ret = axis2_url_create(env, protocol, server, port, "/");
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
else
@@ -263,14 +263,14 @@
{
/* here we have protocol + server + port + path */
ret = axis2_url_create(env, protocol, server, port, path);
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
else
{
/* here we have protocol + server + port + def path */
ret = axis2_url_create(env, protocol, server, port, "/");
- AXIS2_FREE((*env)->allocator, tmp_url_str);
+ AXIS2_FREE(env->allocator, tmp_url_str);
return ret;
}
}
@@ -278,38 +278,38 @@
}
axis2_status_t AXIS2_CALL
-axis2_url_free (axis2_url_t *url, axis2_env_t **env)
+axis2_url_free (axis2_url_t *url, const axis2_env_t *env)
{
axis2_url_impl_t *url_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
url_impl = AXIS2_INTF_TO_IMPL(url);
if(NULL != url_impl->protocol)
{
- AXIS2_FREE((*env)->allocator, url_impl->protocol);
+ AXIS2_FREE(env->allocator, url_impl->protocol);
url_impl->protocol = NULL;
}
if(NULL != url_impl->server)
{
- AXIS2_FREE((*env)->allocator, url_impl->server);
+ AXIS2_FREE(env->allocator, url_impl->server);
url_impl->server = NULL;
}
if(NULL != url_impl->path)
{
- AXIS2_FREE((*env)->allocator, url_impl->path);
+ AXIS2_FREE(env->allocator, url_impl->path);
url_impl->path = NULL;
}
url_impl->port = -1;
if(NULL != url->ops)
- AXIS2_FREE((*env)->allocator, url->ops);
+ AXIS2_FREE(env->allocator, url->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(url));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url));
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
axis2_url_to_external_form (axis2_url_t *url,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_url_impl_t *url_impl = NULL;
axis2_char_t *external_form = NULL;
@@ -321,7 +321,7 @@
len = AXIS2_STRLEN(url_impl->protocol) +
AXIS2_STRLEN(url_impl->server) + AXIS2_STRLEN(url_impl->path) +
strlen(port_str) + 7;
- external_form = (axis2_char_t*) AXIS2_MALLOC((*env)->allocator,
+ external_form = (axis2_char_t*) AXIS2_MALLOC(env->allocator,
len);
sprintf(external_form, "%s://%s:%s%s", url_impl->protocol, url_impl->server,
port_str, url_impl->path);
@@ -330,14 +330,14 @@
axis2_status_t AXIS2_CALL
-axis2_url_set_protocol(axis2_url_t *url, axis2_env_t **env,
+axis2_url_set_protocol(axis2_url_t *url, const axis2_env_t *env,
axis2_char_t *protocol)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, protocol, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, protocol, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->protocol)
{
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(url)->protocol);
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->protocol);
AXIS2_INTF_TO_IMPL(url)->protocol = NULL;
}
AXIS2_INTF_TO_IMPL(url)->protocol = AXIS2_STRDUP(protocol, env);
@@ -346,21 +346,21 @@
axis2_char_t* AXIS2_CALL
-axis2_url_get_protocol (axis2_url_t *url, axis2_env_t **env)
+axis2_url_get_protocol (axis2_url_t *url, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->protocol;
}
axis2_status_t AXIS2_CALL
-axis2_url_set_server(axis2_url_t *url, axis2_env_t **env,
+axis2_url_set_server(axis2_url_t *url, const axis2_env_t *env,
axis2_char_t *server)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, server, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, server, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->server)
{
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(url)->server);
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->server);
AXIS2_INTF_TO_IMPL(url)->server = NULL;
}
AXIS2_INTF_TO_IMPL(url)->server = AXIS2_STRDUP(server, env);
@@ -369,14 +369,14 @@
axis2_char_t* AXIS2_CALL
-axis2_url_get_server (axis2_url_t *url, axis2_env_t **env)
+axis2_url_get_server (axis2_url_t *url, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->server;
}
axis2_status_t AXIS2_CALL
-axis2_url_set_port(axis2_url_t *url, axis2_env_t **env,
+axis2_url_set_port(axis2_url_t *url, const axis2_env_t *env,
int port)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -386,21 +386,21 @@
int AXIS2_CALL
-axis2_url_get_port (axis2_url_t *url, axis2_env_t **env)
+axis2_url_get_port (axis2_url_t *url, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(url)->port;
}
axis2_status_t AXIS2_CALL
-axis2_url_set_path(axis2_url_t *url, axis2_env_t **env,
+axis2_url_set_path(axis2_url_t *url, const axis2_env_t *env,
axis2_char_t *path)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, path, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, path, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(url)->path)
{
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(url)->path);
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->path);
AXIS2_INTF_TO_IMPL(url)->path = NULL;
}
AXIS2_INTF_TO_IMPL(url)->path = AXIS2_STRDUP(path, env);
@@ -409,7 +409,7 @@
axis2_char_t* AXIS2_CALL
-axis2_url_get_path (axis2_url_t *url, axis2_env_t **env)
+axis2_url_get_path (axis2_url_t *url, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(url)->path;
Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
#include <platforms/axis2_platform_auto_sense.h>
AXIS2_DECLARE(axis2_char_t**)
-axis2_parse_request_url_for_svc_and_op(axis2_env_t **env,
+axis2_parse_request_url_for_svc_and_op(const axis2_env_t *env,
axis2_char_t *request)
{
@@ -30,7 +30,7 @@
axis2_char_t *tmp = NULL;
int i = 0;
AXIS2_ENV_CHECK(env, NULL);
- ret = AXIS2_MALLOC((*env)->allocator,
+ ret = AXIS2_MALLOC(env->allocator,
2*(sizeof(axis2_char_t *)));
memset(ret, 0, 2*sizeof(axis2_char_t*));
tmp = request;
@@ -57,7 +57,7 @@
if(NULL != tmp)
{
i = tmp - service_str;
- ret[0] = AXIS2_MALLOC((*env)->allocator, i*sizeof(char)+1);
+ ret[0] = AXIS2_MALLOC(env->allocator, i*sizeof(char)+1);
strncpy(ret[0], service_str,i);
ret[0][i] = '\0';
@@ -70,7 +70,7 @@
if(NULL != tmp)
{
i = tmp - service_str;
- ret[1] = AXIS2_MALLOC((*env)->allocator,
+ ret[1] = AXIS2_MALLOC(env->allocator,
i*sizeof(char)+1);
strncpy(ret[1], service_str,i);
ret[1][i] = '\0';
Modified: webservices/axis2/trunk/c/util/src/uuid_gen.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uuid_gen.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/uuid_gen.c (original)
+++ webservices/axis2/trunk/c/util/src/uuid_gen.c Wed May 31 08:54:07 2006
@@ -19,14 +19,14 @@
AXIS2_DECLARE(axis2_char_t *)
-axis2_uuid_gen(axis2_env_t **env)
+axis2_uuid_gen(const axis2_env_t *env)
{
- axis2_char_t *str = AXIS2_MALLOC((*env)->allocator, 40 * sizeof(char));
+ axis2_char_t *str = AXIS2_MALLOC(env->allocator, 40 * sizeof(char));
axis2_platform_uuid_gen(str);
if (str == NULL)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_UUID_GEN_FAILED,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_UUID_GEN_FAILED,
AXIS2_FAILURE);
return NULL;
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_array_list_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_array_list_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_array_list_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_array_list_test.c Wed May 31 08:54:07 2006
@@ -19,25 +19,25 @@
printf("*************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create(allocator);
+ const axis2_env_t *env = axis2_env_create(allocator);
actual = (a *) AXIS2_MALLOC(env->allocator, sizeof (a));
actual2 = (a *) AXIS2_MALLOC(env->allocator, sizeof (a));
- actual->value = AXIS2_STRDUP("value1", &env);
- actual2->value = AXIS2_STRDUP("value2", &env);
+ actual->value = AXIS2_STRDUP("value1", env);
+ actual2->value = AXIS2_STRDUP("value2", env);
- al = axis2_array_list_create (&env, 10);
+ al = axis2_array_list_create (env, 10);
- AXIS2_ARRAY_LIST_ADD (al, &env, (void*)actual);
- AXIS2_ARRAY_LIST_ADD (al, &env, (void*)actual);
- AXIS2_ARRAY_LIST_ADD (al, &env, (void*)actual);
- AXIS2_ARRAY_LIST_ADD (al, &env, (void*)actual);
- AXIS2_ARRAY_LIST_SET (al, &env, 3, (void*)actual2);
- AXIS2_ARRAY_LIST_REMOVE (al, &env, 2);
+ AXIS2_ARRAY_LIST_ADD (al, env, (void*)actual);
+ AXIS2_ARRAY_LIST_ADD (al, env, (void*)actual);
+ AXIS2_ARRAY_LIST_ADD (al, env, (void*)actual);
+ AXIS2_ARRAY_LIST_ADD (al, env, (void*)actual);
+ AXIS2_ARRAY_LIST_SET (al, env, 3, (void*)actual2);
+ AXIS2_ARRAY_LIST_REMOVE (al, env, 2);
- expected = (a *) AXIS2_ARRAY_LIST_GET (al, &env, 2);
+ expected = (a *) AXIS2_ARRAY_LIST_GET (al, env, 2);
CuAssertStrEquals(tc, expected->value, actual2->value);
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_class_loader_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_class_loader_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_class_loader_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_class_loader_test.c Wed May 31 08:54:07 2006
@@ -18,20 +18,20 @@
printf("testing axis2_class_loader_create_dll\n");
printf("******************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- dll_desc = axis2_dll_desc_create(&env);
+ dll_desc = axis2_dll_desc_create(env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dll_name = AXIS2_STRACAT (axis2c_home, "/services/echo/libecho.so", &env);
+ dll_name = AXIS2_STRACAT (axis2c_home, "/services/echo/libecho.so", env);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, &env, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, &env, AXIS2_SVC_DLL);
- impl_info_param = axis2_param_create(&env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc);
- axis2_class_loader_init(&env);
- svc = axis2_class_loader_create_dll(&env, impl_info_param);
+ AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
+ AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_SVC_DLL);
+ impl_info_param = axis2_param_create(env, NULL, NULL);
+ AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_class_loader_init(env);
+ svc = axis2_class_loader_create_dll(env, impl_info_param);
AXIS2_FREE(env->allocator, dll_name);
CuAssertIntEquals(tc, expected, status);
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_dir_handler_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_dir_handler_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_dir_handler_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_dir_handler_test.c Wed May 31 08:54:07 2006
@@ -17,25 +17,25 @@
printf("******************************************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create(allocator);
+ const axis2_env_t *env = axis2_env_create(allocator);
- expected = AXIS2_STRDUP("libaxis2_util.so", &env);
+ expected = AXIS2_STRDUP("libaxis2_util.so", env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- pathname = AXIS2_STRACAT (axis2c_home, "/lib", &env);
- file_list = AXIS2_DIR_HANDLER_LIST_SERVICES_OR_MODULES_IN_DIR(&env, pathname);
- size = AXIS2_ARRAY_LIST_SIZE(file_list, &env);
+ pathname = AXIS2_STRACAT (axis2c_home, "/lib", env);
+ file_list = AXIS2_DIR_HANDLER_LIST_SERVICES_OR_MODULES_IN_DIR(env, pathname);
+ size = AXIS2_ARRAY_LIST_SIZE(file_list, env);
for (i = 0; i < size; i++)
{
axis2_file_t *arch_file = NULL;
- arch_file = (axis2_file_t *) AXIS2_ARRAY_LIST_GET(file_list, &env, i);
+ arch_file = (axis2_file_t *) AXIS2_ARRAY_LIST_GET(file_list, env, i);
if(!arch_file)
{
printf("arch file is null\n");
continue;
}
- if(0 == AXIS2_STRCMP(AXIS2_FILE_GET_NAME(arch_file, &env), expected))
+ if(0 == AXIS2_STRCMP(AXIS2_FILE_GET_NAME(arch_file, env), expected))
{
- actual = AXIS2_FILE_GET_NAME(arch_file, &env);
+ actual = AXIS2_FILE_GET_NAME(arch_file, env);
}
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c Wed May 31 08:54:07 2006
@@ -14,7 +14,7 @@
{
printf("testing axis2_hash_get\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *environment =
+ const axis2_env_t *environment =
axis2_env_create (allocator);
axis2_hash_t *ht;
@@ -26,13 +26,13 @@
const char *key1 = "key1";
actual = (a *) AXIS2_MALLOC(environment->allocator, sizeof (a));
- actual->value = AXIS2_STRDUP("value1", &environment);
+ actual->value = AXIS2_STRDUP("value1", environment);
- ht = axis2_hash_make (&environment);
+ ht = axis2_hash_make (environment);
axis2_hash_set (ht, key1, AXIS2_HASH_KEY_STRING, actual);
- for (i = axis2_hash_first (ht, &environment); i; i = axis2_hash_next (&environment, i))
+ for (i = axis2_hash_first (ht, environment); i; i = axis2_hash_next (environment, i))
{
axis2_hash_this (i, NULL, NULL, &v);
}
@@ -44,7 +44,7 @@
void Testaxis2_hash_while(CuTest *tc)
{
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *environment =
+ const axis2_env_t *environment =
axis2_env_create (allocator);
axis2_hash_t *ht;
@@ -68,23 +68,23 @@
entry3 = (a *) AXIS2_MALLOC(environment->allocator, sizeof (a));
expected = (a *) AXIS2_MALLOC(environment->allocator, sizeof (a));
- expected->value = AXIS2_STRDUP("value2", &environment);
+ expected->value = AXIS2_STRDUP("value2", environment);
- entry1->value = AXIS2_STRDUP("value1", &environment);
+ entry1->value = AXIS2_STRDUP("value1", environment);
- ht = axis2_hash_make (&environment);
+ ht = axis2_hash_make (environment);
axis2_hash_set (ht, key1, AXIS2_HASH_KEY_STRING, entry1);
- entry2->value = AXIS2_STRDUP("value2", &environment);
+ entry2->value = AXIS2_STRDUP("value2", environment);
axis2_hash_set (ht, key2, AXIS2_HASH_KEY_STRING, entry2);
- entry3->value = AXIS2_STRDUP("value3", &environment);
+ entry3->value = AXIS2_STRDUP("value3", environment);
axis2_hash_set (ht, key3, AXIS2_HASH_KEY_STRING, entry3);
- index_i = axis2_hash_first (ht, &environment);
+ index_i = axis2_hash_first (ht, environment);
do
{
axis2_hash_this (index_i, &k, NULL, &v);
@@ -97,7 +97,7 @@
break;
}
- index_i = axis2_hash_next (&environment, index_i);
+ index_i = axis2_hash_next (environment, index_i);
}while(NULL != index_i);
@@ -112,5 +112,5 @@
free(entry3);
free(entry2->value);
free(entry2);
- axis2_hash_free(ht, &environment);
+ axis2_hash_free(ht, environment);
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_linked_list_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_linked_list_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_linked_list_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_linked_list_test.c Wed May 31 08:54:07 2006
@@ -21,23 +21,23 @@
printf("**************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create(allocator);
+ const axis2_env_t *env = axis2_env_create(allocator);
actual = (a *) AXIS2_MALLOC(env->allocator, sizeof (a));
actual2 = (a *) AXIS2_MALLOC(env->allocator, sizeof (a));
- actual->value = AXIS2_STRDUP("value1", &env);
- actual2->value = AXIS2_STRDUP("value2", &env);
+ actual->value = AXIS2_STRDUP("value1", env);
+ actual2->value = AXIS2_STRDUP("value2", env);
- al = axis2_linked_list_create (&env);
+ al = axis2_linked_list_create (env);
- AXIS2_LINKED_LIST_ADD (al, &env, (void*)actual);
- AXIS2_LINKED_LIST_ADD (al, &env, (void*)actual);
- AXIS2_LINKED_LIST_ADD (al, &env, (void*)actual);
- AXIS2_LINKED_LIST_ADD (al, &env, (void*)actual);
- AXIS2_LINKED_LIST_SET (al, &env, 3, (void*)actual2);
- AXIS2_LINKED_LIST_REMOVE_AT_INDEX (al, &env, 2);
+ AXIS2_LINKED_LIST_ADD (al, env, (void*)actual);
+ AXIS2_LINKED_LIST_ADD (al, env, (void*)actual);
+ AXIS2_LINKED_LIST_ADD (al, env, (void*)actual);
+ AXIS2_LINKED_LIST_ADD (al, env, (void*)actual);
+ AXIS2_LINKED_LIST_SET (al, env, 3, (void*)actual2);
+ AXIS2_LINKED_LIST_REMOVE_AT_INDEX (al, env, 2);
- expected = (a *) AXIS2_LINKED_LIST_GET (al, &env, 2);
+ expected = (a *) AXIS2_LINKED_LIST_GET (al, env, 2);
CuAssertStrEquals(tc, expected->value, actual2->value);
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_log_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_log_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_log_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_log_test.c Wed May 31 08:54:07 2006
@@ -18,12 +18,12 @@
axis2_allocator_t *allocator = axis2_allocator_init(NULL);
axis2_error_t *error = axis2_error_create(allocator);
axis2_log_t *log = axis2_log_create (allocator, NULL, NULL);
- axis2_env_t *env = axis2_env_create_with_error_log(allocator, error, log);
- axis2_stream_t *stream = axis2_stream_create_basic(&env);
+ const axis2_env_t *env = axis2_env_create_with_error_log(allocator, error, log);
+ axis2_stream_t *stream = axis2_stream_create_basic(env);
char *expected = (char*)strdup("aaaaaaaaa");
- AXIS2_STREAM_WRITE(stream, &env, "aaaaaaaaa", 10);
- AXIS2_STREAM_READ(stream, &env, actual, 10);
+ AXIS2_STREAM_WRITE(stream, env, "aaaaaaaaa", 10);
+ AXIS2_STREAM_READ(stream, env, actual, 10);
AXIS2_LOG_WRITE(env->log, actual, 10);
CuAssertStrEquals(tc, expected, actual);
}
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_stream_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_stream_test.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_stream_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_stream_test.c Wed May 31 08:54:07 2006
@@ -15,12 +15,12 @@
axis2_allocator_t *allocator = axis2_allocator_init(NULL);
axis2_error_t *error = axis2_error_create(allocator);
- axis2_env_t *env = axis2_env_create_with_error(allocator, error);
+ const axis2_env_t *env = axis2_env_create_with_error(allocator, error);
- axis2_stream_t *stream = axis2_stream_create_basic(&env);
+ axis2_stream_t *stream = axis2_stream_create_basic(env);
char *expected = (char*) strdup("aaaaaaaaa");
char *write_array = (char*) strdup("aaaaaaaaa");
- AXIS2_STREAM_WRITE(stream, &env, write_array, 10);
- AXIS2_STREAM_READ(stream, &env, actual, 10);
+ AXIS2_STREAM_WRITE(stream, env, write_array, 10);
+ AXIS2_STREAM_READ(stream, env, actual, 10);
CuAssertStrEquals(tc, expected, actual);
}
Modified: webservices/axis2/trunk/c/util/test/util/test_log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.c Wed May 31 08:54:07 2006
@@ -5,7 +5,7 @@
#include <axis2_allocator.h>
#include <test_log.h>
#include <string.h>
-axis2_env_t *create_env_with_error_log()
+const axis2_env_t *create_env_with_error_log()
{
axis2_allocator_t *allocator = axis2_allocator_init(NULL);
if (!allocator)
@@ -31,7 +31,7 @@
*/
log22->level = AXIS2_LOG_LEVEL_DEBUG;
/* log22->enabled = 0;*/
- axis2_env_t *env = axis2_env_create_with_error_log(allocator, error, log22);
+ const axis2_env_t *env = axis2_env_create_with_error_log(allocator, error, log22);
if (!env)
{
printf("cannot create env with error and log\n");
@@ -40,7 +40,7 @@
return env;
}
-void test_axis2_log_write(axis2_env_t *env)
+void test_axis2_log_write(const axis2_env_t *env)
{
char msg[10];
printf("\n####start of test_axis2_log_write\n\n");
@@ -49,7 +49,7 @@
printf("\n####end of test_axis2_log_write\n\n");
}
-void test_axis2_log_debug(axis2_env_t *env)
+void test_axis2_log_debug(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_degug\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
@@ -57,7 +57,7 @@
printf("\n####end of test_axis2_log_debug\n\n");
}
-void test_axis2_log_debug_off(axis2_env_t *env)
+void test_axis2_log_debug_off(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_degug_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
@@ -65,7 +65,7 @@
printf("\n####end of test_axis2_log_debug_off\n\n");
}
-void test_axis2_log_info(axis2_env_t *env)
+void test_axis2_log_info(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_info\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
@@ -74,7 +74,7 @@
}
-void test_axis2_log_info_off(axis2_env_t *env)
+void test_axis2_log_info_off(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_info_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
@@ -83,7 +83,7 @@
}
-void test_axis2_log_warning(axis2_env_t *env)
+void test_axis2_log_warning(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_warning\n\n");
env->log->level = AXIS2_LOG_LEVEL_DEBUG;
@@ -92,7 +92,7 @@
}
-void test_axis2_log_warning_off(axis2_env_t *env)
+void test_axis2_log_warning_off(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_warning_off\n\n");
env->log->level = AXIS2_LOG_LEVEL_ERROR;/*log only ERROR's and CRITICAL's*/
@@ -101,7 +101,7 @@
}
/*no need to sent log level, should always log*/
-void test_axis2_log_error(axis2_env_t *env)
+void test_axis2_log_error(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_error\n\n");
AXIS2_LOG_ERROR(env->log,AXIS2_LOG_SI,"log_error test %s %d","foo",1);
@@ -109,7 +109,7 @@
}
/*no need to sent log level, should always log*/
-void test_axis2_log_critical(axis2_env_t *env)
+void test_axis2_log_critical(const axis2_env_t *env)
{
printf("\n####start of test_axis2_log_critical\n\n");
AXIS2_LOG_CRITICAL(env->log,AXIS2_LOG_SI,"log_critical test %s %d","foo",1);
@@ -119,7 +119,7 @@
void run_test_log()
{
printf("\n####start of run_test_log test suite\n\n");
- axis2_env_t *env = create_env_with_error_log();
+ const axis2_env_t *env = create_env_with_error_log();
if (!env)
return;
test_axis2_log_write(env);
Modified: webservices/axis2/trunk/c/util/test/util/test_log.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_log.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_log.h (original)
+++ webservices/axis2/trunk/c/util/test/util/test_log.h Wed May 31 08:54:07 2006
@@ -4,16 +4,16 @@
#include <axis2_env.h>
void run_test_log();
-axis2_env_t *create_env_with_error_log();
-void test_axis2_log_write(axis2_env_t *env);
-void test_axis2_log_debug(axis2_env_t *env);
-void test_axis2_log_debug_off(axis2_env_t *env);
-void test_axis2_log_info(axis2_env_t *env);
-void test_axis2_log_info_off(axis2_env_t *env);
-void test_axis2_log_warning(axis2_env_t *env);
-void test_axis2_log_warning_off(axis2_env_t *env);
-void test_axis2_log_error(axis2_env_t *env);
-void test_axis2_log_critical(axis2_env_t *env);
+const axis2_env_t *create_env_with_error_log();
+void test_axis2_log_write(const axis2_env_t *env);
+void test_axis2_log_debug(const axis2_env_t *env);
+void test_axis2_log_debug_off(const axis2_env_t *env);
+void test_axis2_log_info(const axis2_env_t *env);
+void test_axis2_log_info_off(const axis2_env_t *env);
+void test_axis2_log_warning(const axis2_env_t *env);
+void test_axis2_log_warning_off(const axis2_env_t *env);
+void test_axis2_log_error(const axis2_env_t *env);
+void test_axis2_log_critical(const axis2_env_t *env);
#endif /* _TEST_LOG_H_ */
Modified: webservices/axis2/trunk/c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.c Wed May 31 08:54:07 2006
@@ -26,7 +26,7 @@
#include <unistd.h>
-axis2_env_t *env = NULL;
+const axis2_env_t *env = NULL;
static axis2_thread_mutex_t *thread_lock = NULL;
static axis2_thread_once_t *control = NULL;
static int x = 0;
@@ -44,7 +44,7 @@
value++;
}
-void thread_init(axis2_env_t *env)
+void thread_init(const axis2_env_t *env)
{
axis2_allocator_t *allocator = NULL;
@@ -79,7 +79,7 @@
}
-void test_axis2_thread_create(axis2_env_t *env)
+void test_axis2_thread_create(const axis2_env_t *env)
{
axis2_status_t rv = AXIS2_FAILURE;
axis2_allocator_t *allocator = NULL;
@@ -122,7 +122,7 @@
return (void*)1;
}
-void test_axis2_thread_detach(axis2_env_t *env)
+void test_axis2_thread_detach(const axis2_env_t *env)
{
axis2_threadattr_t *attr = NULL;
axis2_allocator_t *allocator = NULL;
@@ -174,7 +174,7 @@
printf("success - test_axis2_thread_detach\n");
}
-void test_axis2_thread_detach2(axis2_env_t *env)
+void test_axis2_thread_detach2(const axis2_env_t *env)
{
axis2_threadattr_t *attr = NULL;
axis2_allocator_t *allocator = NULL;
@@ -233,7 +233,7 @@
else printf ("failure - check_thread_once \n");
}
-void run_test_thread(axis2_env_t *env)
+void run_test_thread(const axis2_env_t *env)
{
thread_init(env);
test_axis2_thread_create(env);
@@ -251,11 +251,11 @@
axis2_thread_mutex_destroy(thread_lock);
}
-axis2_env_t *create_env_with_error_log()
+const axis2_env_t *create_env_with_error_log()
{
axis2_error_t *error = NULL;
axis2_log_t *log22 = NULL;
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_allocator_t *allocator = axis2_allocator_init(NULL);
if (!allocator)
{
Modified: webservices/axis2/trunk/c/util/test/util/test_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.h (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.h Wed May 31 08:54:07 2006
@@ -6,15 +6,15 @@
void init_func(void);
-void thread_init(axis2_env_t *env);
+void thread_init(const axis2_env_t *env);
void * AXIS2_CALL test_function(axis2_thread_t *td,void *param);
-void test_axis2_thread_create(axis2_env_t *env);
+void test_axis2_thread_create(const axis2_env_t *env);
void * AXIS2_CALL test_function2(axis2_thread_t *td,void *param);
-void test_axis2_thread_detach(axis2_env_t *env);
-void test_axis2_thread_detach2(axis2_env_t *env);
+void test_axis2_thread_detach(const axis2_env_t *env);
+void test_axis2_thread_detach2(const axis2_env_t *env);
void check_locks();
/*call this method from main*/
-void run_test_thread(axis2_env_t *env);
+void run_test_thread(const axis2_env_t *env);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org