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 [35/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/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Wed May 31 08:54:07 2006
@@ -35,7 +35,7 @@
* @return array list of dll file names
*/
AXIS2_DECLARE(axis2_array_list_t *)
-axis2_dir_handler_list_services_or_modules_in_dir(axis2_env_t **env,
+axis2_dir_handler_list_services_or_modules_in_dir(const axis2_env_t *env,
axis2_char_t *pathname)
{
axis2_array_list_t *file_list = NULL;
@@ -54,7 +54,7 @@
{
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
return NULL;
}
@@ -82,15 +82,15 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);
- AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);
+ AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_FILE_SET_NAME(arch_file, env, fname);
temp_path = AXIS2_STRACAT(pathname, AXIS2_PATH_SEP_STR, env);
path = AXIS2_STRACAT(temp_path, fname, env);
- AXIS2_FREE((*env)->allocator, temp_path);
+ AXIS2_FREE(env->allocator, temp_path);
if(!path)
{
int size = 0;
@@ -108,20 +108,20 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);
- AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);
+ AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_FILE_SET_PATH(arch_file, env, path);
- buf = AXIS2_MALLOC((*env)->allocator, sizeof(struct stat));
+ buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if(!buf)
{
int size = 0;
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
AXIS2_FILE_FREE(arch_file, env);
arch_file = NULL;
@@ -134,9 +134,9 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);
- AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);
+ AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
@@ -150,9 +150,9 @@
AXIS2_FILE_FREE(arch_file, env);
arch_file = NULL;
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
- AXIS2_FREE((*env)->allocator, buf);
+ AXIS2_FREE(env->allocator, buf);
size = AXIS2_ARRAY_LIST_SIZE(file_list, env);
for(j = 0; j < size; j++)
{
@@ -162,19 +162,19 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);
- AXIS2_FREE((*env)->allocator, files);*/
+ /*AXIS2_FREE(env->allocator, *files);
+ AXIS2_FREE(env->allocator, files);*/
return NULL;
}
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
- AXIS2_FREE((*env)->allocator, buf);
+ AXIS2_FREE(env->allocator, buf);
buf = NULL;
arch_file = NULL;
fname = NULL;
}
- /*AXIS2_FREE((*env)->allocator, *files);
- AXIS2_FREE((*env)->allocator, files);*/
+ /*AXIS2_FREE(env->allocator, *files);
+ AXIS2_FREE(env->allocator, files);*/
return file_list;
}
@@ -185,7 +185,7 @@
* @return array list of contents of services or modules folder
*/
AXIS2_DECLARE(axis2_array_list_t *)
-axis2_dir_handler_list_service_or_module_dirs(axis2_env_t **env,
+axis2_dir_handler_list_service_or_module_dirs(const axis2_env_t *env,
axis2_char_t *pathname)
{
axis2_array_list_t *file_list = NULL;
@@ -220,7 +220,7 @@
if (count <= 0)
{
AXIS2_ARRAY_LIST_FREE(file_list, env);
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No files in the path %s.", pathname);
return NULL;
}
@@ -248,9 +248,9 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);*/
- /*AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);*/
+ /*AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_FILE_SET_NAME(arch_file, env, fname);
@@ -274,15 +274,15 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);*/
- /*AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);*/
+ /*AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
AXIS2_FILE_SET_PATH(arch_file, env, path);
/* free temp vars */
- AXIS2_FREE((*env)->allocator, temp_path);
- buf = AXIS2_MALLOC((*env)->allocator, sizeof(struct stat));
+ AXIS2_FREE(env->allocator, temp_path);
+ buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if(!buf)
{
int size = 0;
@@ -291,7 +291,7 @@
AXIS2_FILE_FREE(arch_file, env);
arch_file = NULL;
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
size = AXIS2_ARRAY_LIST_SIZE(file_list, env);
for(j = 0; j < size; j++)
@@ -302,9 +302,9 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);*/
- /*AXIS2_FREE((*env)->allocator, files);*/
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ /*AXIS2_FREE(env->allocator, *files);*/
+ /*AXIS2_FREE(env->allocator, files);*/
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
@@ -318,9 +318,9 @@
AXIS2_FILE_FREE(arch_file, env);
arch_file = NULL;
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
- AXIS2_FREE((*env)->allocator, buf);
+ AXIS2_FREE(env->allocator, buf);
buf = NULL;
size = AXIS2_ARRAY_LIST_SIZE(file_list, env);
for(j = 0; j < size; j++)
@@ -331,14 +331,14 @@
}
AXIS2_ARRAY_LIST_FREE(file_list, env);
file_list = NULL;
- /*AXIS2_FREE((*env)->allocator, *files);*/
- /*AXIS2_FREE((*env)->allocator, files);*/
+ /*AXIS2_FREE(env->allocator, *files);*/
+ /*AXIS2_FREE(env->allocator, files);*/
return NULL;
}
- AXIS2_FREE((*env)->allocator, path);
+ AXIS2_FREE(env->allocator, path);
path = NULL;
- AXIS2_FREE((*env)->allocator, buf);
+ AXIS2_FREE(env->allocator, buf);
buf = NULL;
arch_file = NULL;
fname = NULL;
Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Wed May 31 08:54:07 2006
@@ -43,91 +43,91 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_free (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_char_t *AXIS2_CALL
axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_type (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_dll_type_t type);
axis2_dll_type_t AXIS2_CALL
axis2_dll_desc_get_type (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
int options);
int AXIS2_CALL
axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_DLHANDLER dl_handler);
AXIS2_DLHANDLER AXIS2_CALL
axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
CREATE_FUNCT funct);
CREATE_FUNCT AXIS2_CALL
axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
DELETE_FUNCT funct);
DELETE_FUNCT AXIS2_CALL
axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_timestamp (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_TIME_T timestamp);
AXIS2_TIME_T AXIS2_CALL
axis2_dll_desc_get_timestamp (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t * AXIS2_CALL
axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *class_name);
/************************* End of function headers ****************************/
AXIS2_DECLARE(axis2_dll_desc_t *)
-axis2_dll_desc_create (axis2_env_t **env)
+axis2_dll_desc_create (const axis2_env_t *env)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC ((*env)->allocator
+ dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC (env->allocator
, sizeof (axis2_dll_desc_impl_t));
if(NULL == dll_desc_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;
}
@@ -142,12 +142,12 @@
dll_desc_impl->timestamp = 0;
dll_desc_impl->dll_desc.ops = (axis2_dll_desc_ops_t *) AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_dll_desc_ops_t));
+ env->allocator, sizeof(axis2_dll_desc_ops_t));
if(NULL == dll_desc_impl->dll_desc.ops)
{
axis2_dll_desc_free(&(dll_desc_impl->dll_desc), 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;
}
@@ -175,7 +175,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_free (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -189,19 +189,19 @@
if(dll_desc_impl->dll_name)
{
- AXIS2_FREE((*env)->allocator, dll_desc_impl->dll_name);
+ AXIS2_FREE(env->allocator, dll_desc_impl->dll_name);
dll_desc_impl->dll_name = NULL;
}
if(dll_desc_impl->path_qualified_dll_name)
{
- AXIS2_FREE((*env)->allocator, dll_desc_impl->path_qualified_dll_name);
+ AXIS2_FREE(env->allocator, dll_desc_impl->path_qualified_dll_name);
dll_desc_impl->path_qualified_dll_name = NULL;
}
if(NULL != dll_desc->ops)
{
- AXIS2_FREE((*env)->allocator, dll_desc->ops);
+ AXIS2_FREE(env->allocator, dll_desc->ops);
dll_desc->ops = NULL;
}
dll_desc_impl->create_funct = NULL;
@@ -209,7 +209,7 @@
if(dll_desc_impl)
{
- AXIS2_FREE((*env)->allocator, dll_desc_impl);
+ AXIS2_FREE(env->allocator, dll_desc_impl);
dll_desc_impl = NULL;
}
@@ -218,7 +218,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_free_void_arg (void *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_dll_desc_t *dll_desc_l = NULL;
@@ -229,18 +229,18 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
if(dll_desc_impl->path_qualified_dll_name)
{
- AXIS2_FREE((*env)->allocator, dll_desc_impl->path_qualified_dll_name);
+ AXIS2_FREE(env->allocator, dll_desc_impl->path_qualified_dll_name);
dll_desc_impl->path_qualified_dll_name = NULL;
}
dll_desc_impl->path_qualified_dll_name = AXIS2_STRDUP(name, env);
@@ -253,7 +253,7 @@
axis2_char_t *AXIS2_CALL
axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(dll_desc)->path_qualified_dll_name;
@@ -261,7 +261,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
int options)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -277,7 +277,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_type (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_dll_type_t type)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -293,7 +293,7 @@
axis2_dll_type_t AXIS2_CALL
axis2_dll_desc_get_type (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(dll_desc)->dll_type;
@@ -301,7 +301,7 @@
int AXIS2_CALL
axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(dll_desc)->load_options;
@@ -309,19 +309,19 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_DLHANDLER dl_handler)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dl_handler, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dl_handler, AXIS2_FAILURE);
dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
if(dll_desc_impl->dl_handler)
{
- AXIS2_FREE((*env)->allocator, dll_desc_impl->dl_handler);
+ AXIS2_FREE(env->allocator, dll_desc_impl->dl_handler);
dll_desc_impl->dl_handler = NULL;
}
dll_desc_impl->dl_handler = dl_handler;
@@ -330,7 +330,7 @@
AXIS2_DLHANDLER AXIS2_CALL
axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(dll_desc)->dl_handler;
@@ -338,7 +338,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
CREATE_FUNCT funct)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -354,7 +354,7 @@
CREATE_FUNCT AXIS2_CALL
axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(dll_desc)->create_funct;
@@ -362,7 +362,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
DELETE_FUNCT funct)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -378,7 +378,7 @@
DELETE_FUNCT AXIS2_CALL
axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(dll_desc)->delete_funct;
@@ -386,7 +386,7 @@
axis2_status_t AXIS2_CALL
axis2_dll_desc_set_timestamp (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_TIME_T timestamp)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -400,7 +400,7 @@
AXIS2_TIME_T AXIS2_CALL
axis2_dll_desc_get_timestamp (axis2_dll_desc_t *dll_desc,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(dll_desc)->timestamp;
@@ -408,7 +408,7 @@
axis2_char_t* AXIS2_CALL
axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *class_name)
{
axis2_dll_desc_impl_t *dll_desc_impl = NULL;
@@ -419,6 +419,6 @@
temp_name = AXIS2_STRACAT(AXIS2_LIB_PREFIX, class_name, env);
dll_desc_impl->dll_name = AXIS2_STRACAT(temp_name, AXIS2_LIB_SUFFIX, env);
- AXIS2_FREE((*env)->allocator, temp_name);
+ AXIS2_FREE(env->allocator, temp_name);
return dll_desc_impl->dll_name;
}
Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Wed May 31 08:54:07 2006
@@ -157,32 +157,32 @@
}
AXIS2_DECLARE( axis2_status_t )
-axis2_env_check_status (axis2_env_t **env)
+axis2_env_check_status (const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
- return AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
-AXIS2_DECLARE(axis2_status_t) axis2_env_enable_log (axis2_env_t **env, axis2_bool_t enable)
+AXIS2_DECLARE(axis2_status_t) axis2_env_enable_log (axis2_env_t *env, axis2_bool_t enable)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
- (*env)->log_enabled = enable;
+ env->log_enabled = enable;
return AXIS2_SUCCESS;
}
-AXIS2_DECLARE(axis2_status_t) axis2_env_write_log (axis2_env_t **env, const char* message, axis2_log_levels_t level)
+AXIS2_DECLARE(axis2_status_t) axis2_env_write_log (const axis2_env_t *env, const char* message, axis2_log_levels_t level)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
- if (! ((*env)->log_enabled))
+ if (! (env->log_enabled))
return AXIS2_SUCCESS;
- if (message && (*env)->log)
+ if (message && env->log)
{
- AXIS2_LOG_WRITE((*env)->log, message, level);
+ AXIS2_LOG_WRITE(env->log, message, level);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Wed May 31 08:54:07 2006
@@ -34,54 +34,54 @@
axis2_status_t AXIS2_CALL
axis2_file_free (axis2_file_t *file,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_file_set_name(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_char_t *AXIS2_CALL
axis2_file_get_name(axis2_file_t *file,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_file_set_path(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *path);
axis2_char_t *AXIS2_CALL
axis2_file_get_path(axis2_file_t *file,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_file_set_timestamp(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_TIME_T timestamp);
AXIS2_TIME_T AXIS2_CALL
axis2_file_get_timestamp(axis2_file_t *file,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_file_t *AXIS2_CALL
axis2_file_clone(axis2_file_t *file,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of function prototypes ************************/
axis2_file_t *AXIS2_CALL
-axis2_file_create(axis2_env_t **env)
+axis2_file_create(const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- file_impl = (axis2_file_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ file_impl = (axis2_file_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_file_impl_t));
if(NULL == file_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;
}
file_impl->name = NULL;
@@ -89,11 +89,11 @@
file_impl->timestamp = 0;
file_impl->file.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_file_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_file_ops_t));
if(NULL == file_impl->file.ops)
{
axis2_file_free(&(file_impl->file), 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;
}
@@ -113,7 +113,7 @@
axis2_status_t AXIS2_CALL
axis2_file_free (axis2_file_t *file,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -121,25 +121,25 @@
if(file_impl->name)
{
- AXIS2_FREE((*env)->allocator, file_impl->name);
+ AXIS2_FREE(env->allocator, file_impl->name);
file_impl->name = NULL;
}
if(file_impl->path)
{
- AXIS2_FREE((*env)->allocator, file_impl->path);
+ AXIS2_FREE(env->allocator, file_impl->path);
file_impl->path = NULL;
}
if(file_impl->file.ops)
{
- AXIS2_FREE((*env)->allocator, file_impl->file.ops);
+ AXIS2_FREE(env->allocator, file_impl->file.ops);
file_impl->file.ops = NULL;
}
if(file_impl)
{
- AXIS2_FREE((*env)->allocator, file_impl);
+ AXIS2_FREE(env->allocator, file_impl);
file_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -147,23 +147,23 @@
axis2_status_t AXIS2_CALL
axis2_file_set_name(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
axis2_file_impl_t *file_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);
file_impl = AXIS2_INTF_TO_IMPL(file);
if(file_impl->name)
{
- AXIS2_FREE((*env)->allocator, file_impl->name);
+ AXIS2_FREE(env->allocator, file_impl->name);
file_impl->name = NULL;
}
file_impl->name = AXIS2_STRDUP(name, env);
if(!file_impl->name)
{
- 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;
}
return AXIS2_SUCCESS;
@@ -171,7 +171,7 @@
axis2_char_t *AXIS2_CALL
axis2_file_get_name(axis2_file_t *file,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
@@ -180,7 +180,7 @@
if(!file_impl->name)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
AXIS2_FAILURE);
return NULL;
}
@@ -190,7 +190,7 @@
axis2_status_t AXIS2_CALL
axis2_file_set_path(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *path)
{
axis2_file_impl_t *file_impl = NULL;
@@ -204,13 +204,13 @@
if(file_impl->path)
{
- AXIS2_FREE((*env)->allocator, file_impl->path);
+ AXIS2_FREE(env->allocator, file_impl->path);
file_impl->path = NULL;
}
file_impl->path = AXIS2_STRDUP(path, env);
if(!(file_impl->path))
{
- 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;
}
return AXIS2_SUCCESS;
@@ -218,7 +218,7 @@
axis2_char_t *AXIS2_CALL
axis2_file_get_path(axis2_file_t *file,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
@@ -227,7 +227,7 @@
if(!(file_impl->path))
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
AXIS2_FAILURE);
return NULL;
}
@@ -237,7 +237,7 @@
axis2_status_t AXIS2_CALL
axis2_file_set_timestamp(axis2_file_t *file,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_TIME_T timestamp)
{
axis2_file_impl_t *file_impl = NULL;
@@ -252,7 +252,7 @@
AXIS2_TIME_T AXIS2_CALL
axis2_file_get_timestamp(axis2_file_t *file,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -262,7 +262,7 @@
axis2_file_t *AXIS2_CALL
axis2_file_clone(axis2_file_t *file,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_file_impl_t *file_impl = NULL;
axis2_file_t *new_file = NULL;
Modified: webservices/axis2/trunk/c/util/src/file_diff.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file_diff.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/file_diff.c (original)
+++ webservices/axis2/trunk/c/util/src/file_diff.c Wed May 31 08:54:07 2006
@@ -23,9 +23,9 @@
axis2_stream_t *expected_file_stream, *actual_file_stream; /* Streams corresponding to above files*/
axis2_stream_t *output_stream;
/* private function header */
-axis2_status_t axis2_file_diff_clean(axis2_env_t *env);
+axis2_status_t axis2_file_diff_clean(const axis2_env_t *env);
-axis2_status_t AXIS2_CALL axis2_file_diff(axis2_env_t *env
+axis2_status_t AXIS2_CALL axis2_file_diff(const axis2_env_t *env
, axis2_char_t* expected_file_name, axis2_char_t* actual_file_name)
{
int ch1, ch2;
@@ -43,9 +43,9 @@
return AXIS2_ERROR_COULD_NOT_OPEN_FILE;
}
- expected_file_stream = axis2_stream_create_file(&env, expected_file);
- actual_file_stream = axis2_stream_create_file(&env, actual_file);
- output_stream = axis2_stream_create_file(&env, stdout);
+ expected_file_stream = axis2_stream_create_file(env, expected_file);
+ actual_file_stream = axis2_stream_create_file(env, actual_file);
+ output_stream = axis2_stream_create_file(env, stdout);
if( expected_file_stream == NULL || actual_file_stream == NULL ) {
/*printf("Unable to open one of datafile %s, %s\n", expected_file_name
@@ -56,8 +56,8 @@
buffer1 = (axis2_char_t*) AXIS2_MALLOC(env->allocator, 8096 * sizeof(axis2_char_t));
buffer2 = (axis2_char_t*) AXIS2_MALLOC(env->allocator, 8096 * sizeof(axis2_char_t));
- ch1 = AXIS2_STREAM_GET_CHAR (expected_file_stream, &env);
- ch2 = AXIS2_STREAM_GET_CHAR (actual_file_stream, &env);
+ ch1 = AXIS2_STREAM_GET_CHAR (expected_file_stream, env);
+ ch2 = AXIS2_STREAM_GET_CHAR (actual_file_stream, env);
while(1)
@@ -79,13 +79,13 @@
if(flag1 == 1 && flag2 == 0)
{
- AXIS2_STREAM_UNGET_CHAR(actual_file_stream, &env, ch2);
+ AXIS2_STREAM_UNGET_CHAR(actual_file_stream, env, ch2);
j++;
buffer1[j] = ch1;
}
if(flag1 == 0 && flag2 == 1)
{
- AXIS2_STREAM_UNGET_CHAR(expected_file_stream, &env, ch1);
+ AXIS2_STREAM_UNGET_CHAR(expected_file_stream, env, ch1);
k++;
buffer2[k] = ch2;
}
@@ -93,25 +93,25 @@
{
if(ch1 != ch2)
{
- AXIS2_STREAM_WRITE(output_stream, &env
+ AXIS2_STREAM_WRITE(output_stream, env
, "\n****************************** TEST FAILED *********" \
"**************************\n", 80);
*buffer1 = '\n';
*buffer2 = '\n';
- AXIS2_STREAM_WRITE(output_stream, &env
+ AXIS2_STREAM_WRITE(output_stream, env
, "\n---------------------- Expected file read upto: ----" \
"--------------------------\n", 80);
/*printf("%s\n", buffer1); */
- AXIS2_STREAM_WRITE(output_stream, &env, buffer1, j);
- AXIS2_STREAM_WRITE(output_stream, &env
+ AXIS2_STREAM_WRITE(output_stream, env, buffer1, j);
+ AXIS2_STREAM_WRITE(output_stream, env
, "\n---------------------- Actual file read upto: ------" \
"--------------------------\n", 80);
/* printf("%s\n", buffer2); */
- AXIS2_STREAM_WRITE(output_stream, &env, buffer2, k);
- AXIS2_STREAM_WRITE(output_stream, &env, "\n", 1);
+ AXIS2_STREAM_WRITE(output_stream, env, buffer2, k);
+ AXIS2_STREAM_WRITE(output_stream, env, "\n", 1);
axis2_file_diff_clean(env);
}
@@ -131,32 +131,32 @@
if(ch1 == expected_file_stream->axis2_eof || ch2 == actual_file_stream->axis2_eof)
break;
- ch1 = AXIS2_STREAM_GET_CHAR(expected_file_stream, &env);
- ch2 = AXIS2_STREAM_GET_CHAR(actual_file_stream, &env);
+ ch1 = AXIS2_STREAM_GET_CHAR(expected_file_stream, env);
+ ch2 = AXIS2_STREAM_GET_CHAR(actual_file_stream, env);
}
- AXIS2_STREAM_WRITE(output_stream, &env
+ AXIS2_STREAM_WRITE(output_stream, env
, "\n************************* TEST PASSED **************************" \
"**************\n", 80);
return AXIS2_SUCCESS;
}
-axis2_status_t axis2_file_diff_clean (axis2_env_t *env)
+axis2_status_t axis2_file_diff_clean (const axis2_env_t *env)
{
if(NULL != expected_file_stream)
{
- AXIS2_STREAM_FREE(expected_file_stream, &env);
+ AXIS2_STREAM_FREE(expected_file_stream, env);
expected_file_stream = NULL;
}
if(NULL != actual_file_stream)
{
- AXIS2_STREAM_FREE(actual_file_stream, &env);
+ AXIS2_STREAM_FREE(actual_file_stream, env);
actual_file_stream = NULL;
}
if(NULL != output_stream)
{
- AXIS2_STREAM_FREE(output_stream, &env);
+ AXIS2_STREAM_FREE(output_stream, env);
output_stream = NULL;
}
Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Wed May 31 08:54:07 2006
@@ -29,48 +29,48 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_free (axis2_generic_obj_t *generic_obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_free_func(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_FREE_VOID_ARG free_func);
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_value(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value);
void *AXIS2_CALL
axis2_generic_obj_get_value(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env);
+ const axis2_env_t *env);
/************************** End of function prototypes ************************/
axis2_generic_obj_t *AXIS2_CALL
-axis2_generic_obj_create(axis2_env_t **env)
+axis2_generic_obj_create(const axis2_env_t *env)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- generic_obj_impl = (axis2_generic_obj_impl_t *) AXIS2_MALLOC((*env)->allocator,
+ generic_obj_impl = (axis2_generic_obj_impl_t *) AXIS2_MALLOC(env->allocator,
sizeof(axis2_generic_obj_impl_t));
if(NULL == generic_obj_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;
}
generic_obj_impl->value= NULL;
generic_obj_impl->free_func = 0;
generic_obj_impl->generic_obj.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_generic_obj_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_generic_obj_ops_t));
if(NULL == generic_obj_impl->generic_obj.ops)
{
axis2_generic_obj_free(&(generic_obj_impl->generic_obj), 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;
}
@@ -85,7 +85,7 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_free (axis2_generic_obj_t *generic_obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -99,20 +99,20 @@
}
else
{
- AXIS2_FREE((*env)->allocator, generic_obj_impl->value);
+ AXIS2_FREE(env->allocator, generic_obj_impl->value);
}
generic_obj_impl->value = NULL;
}
if(generic_obj_impl->generic_obj.ops)
{
- AXIS2_FREE((*env)->allocator, generic_obj_impl->generic_obj.ops);
+ AXIS2_FREE(env->allocator, generic_obj_impl->generic_obj.ops);
generic_obj_impl->generic_obj.ops = NULL;
}
if(generic_obj_impl)
{
- AXIS2_FREE((*env)->allocator, generic_obj_impl);
+ AXIS2_FREE(env->allocator, generic_obj_impl);
generic_obj_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -120,7 +120,7 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_free_func(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
AXIS2_FREE_VOID_ARG free_func)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
@@ -134,7 +134,7 @@
axis2_status_t AXIS2_CALL
axis2_generic_obj_set_value(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
@@ -148,7 +148,7 @@
void *AXIS2_CALL
axis2_generic_obj_get_value(axis2_generic_obj_t *generic_obj,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_generic_obj_impl_t *generic_obj_impl = NULL;
Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Wed May 31 08:54:07 2006
@@ -63,7 +63,7 @@
*/
struct axis2_hash_t
{
- axis2_env_t *env;
+ const axis2_env_t *env;
axis2_hash_entry_t **array;
axis2_hash_index_t iterator; /* For axis2_hash_first(NULL, ...) */
unsigned int count, max;
@@ -87,13 +87,13 @@
}
AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_make (axis2_env_t **env)
+axis2_hash_make (const axis2_env_t *env)
{
axis2_hash_t *ht;
AXIS2_ENV_CHECK(env, NULL);
- ht = AXIS2_MALLOC ((*env)->allocator, sizeof (axis2_hash_t));
- ht->env = (*env);
+ ht = AXIS2_MALLOC (env->allocator, sizeof (axis2_hash_t));
+ ht->env = env;
ht->free = NULL;
ht->count = 0;
ht->max = INITIAL_MAX;
@@ -103,7 +103,7 @@
}
AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_make_custom (axis2_env_t **env,
+axis2_hash_make_custom (const axis2_env_t *env,
axis2_hashfunc_t hash_func)
{
axis2_hash_t *ht;
@@ -119,15 +119,15 @@
*/
AXIS2_DECLARE(axis2_hash_index_t*)
-axis2_hash_next (axis2_env_t **env, axis2_hash_index_t *hi)
+axis2_hash_next (const axis2_env_t *env, axis2_hash_index_t *hi)
{
hi->this = hi->next;
while (!hi->this)
{
if (hi->index > hi->ht->max)
{
- if (env && *env)
- AXIS2_FREE ((*env)->allocator, hi);
+ if (env)
+ AXIS2_FREE (env->allocator, hi);
return NULL;
}
@@ -138,11 +138,11 @@
}
AXIS2_DECLARE(axis2_hash_index_t*)
-axis2_hash_first (axis2_hash_t *ht, axis2_env_t **env)
+axis2_hash_first (axis2_hash_t *ht, const axis2_env_t *env)
{
axis2_hash_index_t *hi;
- if (env && *env)
- hi = AXIS2_MALLOC ((*env)->allocator, sizeof (*hi));
+ if (env)
+ hi = AXIS2_MALLOC (env->allocator, sizeof (*hi));
else
hi = &ht->iterator;
@@ -304,7 +304,7 @@
}
AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_copy (const axis2_hash_t *orig, axis2_env_t **env)
+axis2_hash_copy (const axis2_hash_t *orig, const axis2_env_t *env)
{
axis2_hash_t *ht;
axis2_hash_entry_t *new_vals;
@@ -312,10 +312,10 @@
AXIS2_ENV_CHECK(env, NULL);
- ht = AXIS2_MALLOC ((*env)->allocator, sizeof (axis2_hash_t) +
+ ht = AXIS2_MALLOC (env->allocator, sizeof (axis2_hash_t) +
sizeof (*ht->array) * (orig->max + 1) +
sizeof (axis2_hash_entry_t) * orig->count);
- ht->env = (*env);
+ ht->env = env;
ht->free = NULL;
ht->count = orig->count;
ht->max = orig->max;
@@ -393,7 +393,7 @@
}
AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_overlay (const axis2_hash_t *overlay, axis2_env_t **env
+axis2_hash_overlay (const axis2_hash_t *overlay, const axis2_env_t *env
, const axis2_hash_t * base)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -401,8 +401,8 @@
}
AXIS2_DECLARE(axis2_hash_t*)
-axis2_hash_merge (const axis2_hash_t *overlay, axis2_env_t **env
- , const axis2_hash_t * base, void *(*merger) (axis2_env_t * env
+axis2_hash_merge (const axis2_hash_t *overlay, const axis2_env_t *env
+ , const axis2_hash_t * base, void *(*merger) (const axis2_env_t * env
, const void *key, axis2_ssize_t klen, const void *h1_val
, const void *h2_val, const void *data), const void *data)
{
@@ -432,8 +432,8 @@
}
#endif
- res = AXIS2_MALLOC ((*env)->allocator, sizeof (axis2_hash_t));
- res->env = *env;
+ res = AXIS2_MALLOC (env->allocator, sizeof (axis2_hash_t));
+ res->env = env;
res->free = NULL;
res->hash_func = base->hash_func;
res->count = base->count;
@@ -446,7 +446,7 @@
if (base->count + overlay->count)
{
new_vals =
- AXIS2_MALLOC ((*env)->allocator,
+ AXIS2_MALLOC (env->allocator,
sizeof (axis2_hash_entry_t) * (base->count +
overlay->count));
}
@@ -479,7 +479,7 @@
if (merger)
{
ent->val =
- (*merger) ((*env), iter->key, iter->klen,
+ (*merger) (env, iter->key, iter->klen,
iter->val, ent->val, data);
}
else
@@ -506,7 +506,7 @@
}
static axis2_status_t
-axis2_hash_entry_free (axis2_env_t **env, axis2_hash_entry_t *hash_entry)
+axis2_hash_entry_free (const axis2_env_t *env, axis2_hash_entry_t *hash_entry)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (!hash_entry)
@@ -515,12 +515,12 @@
{
axis2_hash_entry_free (env, hash_entry->next);
}
- AXIS2_FREE ((*env)->allocator, hash_entry);
+ AXIS2_FREE (env->allocator, hash_entry);
return AXIS2_SUCCESS;
}
AXIS2_DECLARE(axis2_status_t)
-axis2_hash_free (axis2_hash_t *ht, axis2_env_t** env)
+axis2_hash_free (axis2_hash_t *ht, const axis2_env_t* env)
{
int i =0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -533,7 +533,7 @@
while(current)
{
next = current->next;
- AXIS2_FREE((*env)->allocator, current);
+ AXIS2_FREE(env->allocator, current);
current = NULL;
current = next;
}
@@ -545,20 +545,20 @@
while(current)
{
next = current->next;
- AXIS2_FREE((*env)->allocator, current);
+ AXIS2_FREE(env->allocator, current);
current = NULL;
current = next;
}
}
- AXIS2_FREE((*env)->allocator, (ht->array));
- AXIS2_FREE ((*env)->allocator, ht);
+ AXIS2_FREE(env->allocator, (ht->array));
+ AXIS2_FREE (env->allocator, ht);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
}
AXIS2_DECLARE(axis2_status_t)
-axis2_hash_free_void_arg (void *ht_void, axis2_env_t** env)
+axis2_hash_free_void_arg (void *ht_void, const axis2_env_t* env)
{
int i =0;
axis2_hash_t *ht = (axis2_hash_t*)ht_void;
@@ -572,12 +572,12 @@
while(current)
{
next = current->next;
- AXIS2_FREE((*env)->allocator, current);
+ AXIS2_FREE(env->allocator, current);
current = next;
}
}
- AXIS2_FREE((*env)->allocator, (ht->array));
- AXIS2_FREE ((*env)->allocator, ht);
+ AXIS2_FREE(env->allocator, (ht->array));
+ AXIS2_FREE (env->allocator, ht);
return AXIS2_SUCCESS;
}
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Wed May 31 08:54:07 2006
@@ -60,41 +60,41 @@
axis2_status_t AXIS2_CALL axis2_linked_list_free(
axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
entry_t * AXIS2_CALL
axis2_linked_list_get_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int n);
axis2_status_t AXIS2_CALL
axis2_linked_list_remove_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
entry_t *e);
axis2_bool_t AXIS2_CALL
axis2_linked_list_check_bounds_inclusive(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
axis2_bool_t AXIS2_CALL
axis2_linked_list_check_bounds_exclusive(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
void * AXIS2_CALL
axis2_linked_list_get_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_linked_list_get_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_linked_list_remove_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* Remove and return the last element in the list.
@@ -103,27 +103,27 @@
*/
void * AXIS2_CALL
axis2_linked_list_remove_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_linked_list_add_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
axis2_status_t AXIS2_CALL
axis2_linked_list_add_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
static axis2_status_t
add_last_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
entry_t *e);
axis2_bool_t AXIS2_CALL
axis2_linked_list_contains(axis2_linked_list_t *linked_list,
- axis2_env_t ** env,
+ const axis2_env_t *env,
void *o);
/**
@@ -133,84 +133,84 @@
*/
int AXIS2_CALL
axis2_linked_list_size(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_linked_list_add(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
axis2_bool_t AXIS2_CALL
axis2_linked_list_remove(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
axis2_status_t AXIS2_CALL
axis2_linked_list_clear(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
void * AXIS2_CALL
axis2_linked_list_get(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
void * AXIS2_CALL
axis2_linked_list_set(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index,
void *o);
axis2_status_t AXIS2_CALL
axis2_linked_list_add_at_index(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index,
void *o);
void * AXIS2_CALL
axis2_linked_list_remove_at_index(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index);
int AXIS2_CALL
axis2_linked_list_index_of(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
int AXIS2_CALL
axis2_linked_list_last_index_of(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o);
void ** AXIS2_CALL
axis2_linked_list_to_array(axis2_linked_list_t *linked_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/********************************End of function headers***********************/
axis2_linked_list_t *AXIS2_CALL
-axis2_linked_list_create(axis2_env_t **env)
+axis2_linked_list_create(const axis2_env_t *env)
{
axis2_linked_list_impl_t *linked_list_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- linked_list_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_linked_list_impl_t) );
+ linked_list_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_linked_list_impl_t) );
if (!linked_list_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;
}
/* initialize ops */
linked_list_impl->linked_list.ops = NULL;
- linked_list_impl->linked_list.ops = AXIS2_MALLOC( (*env)->allocator,
+ linked_list_impl->linked_list.ops = AXIS2_MALLOC( env->allocator,
sizeof(axis2_linked_list_ops_t) );
if (!linked_list_impl->linked_list.ops)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
axis2_linked_list_free(&(linked_list_impl->linked_list), env);
return NULL;
}
@@ -253,12 +253,12 @@
* @param data the list element
*/
static entry_t *
-create_entry(axis2_env_t **env, void *data)
+create_entry(const axis2_env_t *env, void *data)
{
- entry_t *entry = (entry_t *) AXIS2_MALLOC((*env)->allocator, sizeof(entry_t));
+ entry_t *entry = (entry_t *) AXIS2_MALLOC(env->allocator, sizeof(entry_t));
if(NULL == entry)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -275,11 +275,11 @@
*/
static axis2_status_t
add_last_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
entry_t *e)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, e, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, e, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(linked_list)->mod_count++;
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
@@ -298,7 +298,7 @@
axis2_status_t AXIS2_CALL axis2_linked_list_free(
axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_linked_list_impl_t *linked_list_impl = NULL;
entry_t *current = NULL, *next = NULL;
@@ -309,7 +309,7 @@
if (NULL != linked_list_impl->linked_list.ops)
{
- AXIS2_FREE((*env)->allocator, linked_list_impl->linked_list.ops);
+ AXIS2_FREE(env->allocator, linked_list_impl->linked_list.ops);
linked_list_impl->linked_list.ops = NULL;
}
@@ -317,11 +317,11 @@
while(NULL != current)
{
next = current->next;
- AXIS2_FREE((*env)->allocator, current);
+ AXIS2_FREE(env->allocator, current);
current = next;
}
- AXIS2_FREE((*env)->allocator, linked_list_impl);
+ AXIS2_FREE(env->allocator, linked_list_impl);
linked_list_impl = NULL;
return AXIS2_SUCCESS;
@@ -341,7 +341,7 @@
*/
entry_t * AXIS2_CALL
axis2_linked_list_get_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int n)
{
entry_t *e = NULL;
@@ -377,11 +377,11 @@
*/
axis2_status_t AXIS2_CALL
axis2_linked_list_remove_entry(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
entry_t *e)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, e, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, e, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(linked_list)->mod_count++;
AXIS2_INTF_TO_IMPL(linked_list)->size--;
@@ -416,14 +416,14 @@
*/
axis2_bool_t AXIS2_CALL
axis2_linked_list_check_bounds_inclusive(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
if (index < 0 || index > AXIS2_INTF_TO_IMPL(linked_list)->size)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
return AXIS2_FALSE;
}
return AXIS2_TRUE;
@@ -436,13 +436,13 @@
*/
axis2_bool_t AXIS2_CALL
axis2_linked_list_check_bounds_exclusive(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
if (index < 0 || index >= AXIS2_INTF_TO_IMPL(linked_list)->size)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INDEX_OUT_OF_BOUNDS, AXIS2_FAILURE);
return AXIS2_FALSE;
}
return AXIS2_TRUE;
@@ -455,12 +455,12 @@
*/
void * AXIS2_CALL
axis2_linked_list_get_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
return NULL;
}
@@ -474,13 +474,13 @@
*/
void * AXIS2_CALL
axis2_linked_list_get_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
return NULL;
}
@@ -494,14 +494,14 @@
*/
void * AXIS2_CALL
axis2_linked_list_remove_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
void *r;
AXIS2_ENV_CHECK(env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
return NULL;
}
@@ -527,14 +527,14 @@
*/
void * AXIS2_CALL
axis2_linked_list_remove_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
void *r = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (AXIS2_INTF_TO_IMPL(linked_list)->size == 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_SUCH_ELEMENT, AXIS2_FAILURE);
return NULL;
}
@@ -560,12 +560,12 @@
*/
axis2_status_t AXIS2_CALL
axis2_linked_list_add_first(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
entry_t *e ;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
e = create_entry(env, o);
@@ -591,12 +591,12 @@
*/
axis2_status_t AXIS2_CALL
axis2_linked_list_add_last(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
e = create_entry(env, o);
return add_last_entry(linked_list, env, e);
@@ -611,12 +611,12 @@
*/
axis2_bool_t AXIS2_CALL
axis2_linked_list_contains(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FALSE);
e = AXIS2_INTF_TO_IMPL(linked_list)->first;
while (e != NULL)
@@ -635,7 +635,7 @@
*/
int AXIS2_CALL
axis2_linked_list_size(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
return AXIS2_INTF_TO_IMPL(linked_list)->size;
@@ -649,12 +649,12 @@
*/
axis2_bool_t AXIS2_CALL
axis2_linked_list_add(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FALSE);
e = create_entry(env, o);
return add_last_entry(linked_list, env, e);
}
@@ -668,12 +668,12 @@
*/
axis2_bool_t AXIS2_CALL
axis2_linked_list_remove(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FALSE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FALSE);
e = AXIS2_INTF_TO_IMPL(linked_list)->first;
while (e != NULL)
@@ -694,7 +694,7 @@
*/
axis2_status_t AXIS2_CALL
axis2_linked_list_clear(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (AXIS2_INTF_TO_IMPL(linked_list)->size > 0)
@@ -716,7 +716,7 @@
*/
void * AXIS2_CALL
axis2_linked_list_get(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -733,13 +733,13 @@
*/
void * AXIS2_CALL
axis2_linked_list_set(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index, void *o)
{
entry_t *e;
void *old;
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK((*env)->error, o, NULL);
+ AXIS2_PARAM_CHECK(env->error, o, NULL);
axis2_linked_list_check_bounds_exclusive(linked_list, env, index);
e = axis2_linked_list_get_entry(linked_list, env, index);
old = e->data;
@@ -755,14 +755,14 @@
*/
axis2_status_t AXIS2_CALL
axis2_linked_list_add_at_index(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index,
void *o)
{
entry_t *after = NULL;
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
axis2_linked_list_check_bounds_inclusive(linked_list, env, index);
e = create_entry(env, o);
@@ -794,7 +794,7 @@
*/
void * AXIS2_CALL
axis2_linked_list_remove_at_index(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
int index)
{
entry_t *e;
@@ -813,13 +813,13 @@
*/
int AXIS2_CALL
axis2_linked_list_index_of(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
int index = 0;
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
e = AXIS2_INTF_TO_IMPL(linked_list)->first;
while (e != NULL)
@@ -840,13 +840,13 @@
*/
int AXIS2_CALL
axis2_linked_list_last_index_of(axis2_linked_list_t *linked_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *o)
{
int index;
entry_t *e;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, o, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
index = AXIS2_INTF_TO_IMPL(linked_list)->size - 1;
e = AXIS2_INTF_TO_IMPL(linked_list)->last;
@@ -867,13 +867,13 @@
*/
void ** AXIS2_CALL
axis2_linked_list_to_array(axis2_linked_list_t *linked_list,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
int i = 0;
void **array;
entry_t *e;
AXIS2_ENV_CHECK(env, NULL);
- array = (void **) AXIS2_MALLOC((*env)->allocator,
+ array = (void **) AXIS2_MALLOC(env->allocator,
AXIS2_INTF_TO_IMPL(linked_list)->size * sizeof(void *));
e = AXIS2_INTF_TO_IMPL(linked_list)->first;
for (i = 0; i < AXIS2_INTF_TO_IMPL(linked_list)->size; i++)
Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Wed May 31 08:54:07 2006
@@ -503,5 +503,5 @@
#else
AXIS2_DECLARE(axis2_status_t) axis2_log_impl_log_trace(axis2_log_t *log,
const axis2_char_t *filename, const int linenumber,
- const axis2_char_t *format,...) {}
+ const axis2_char_t *format,...) { return AXIS2_SUCCESS;}
#endif
Modified: webservices/axis2/trunk/c/util/src/minizip/axis2_archive_extract.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/axis2_archive_extract.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/axis2_archive_extract.h (original)
+++ webservices/axis2/trunk/c/util/src/minizip/axis2_archive_extract.h Wed May 31 08:54:07 2006
@@ -30,4 +30,5 @@
}
#endif
-#endif /** AXIS2_ARCHIVE_EXTRACT_H */
\ No newline at end of file
+#endif /** AXIS2_ARCHIVE_EXTRACT_H */
+
Modified: webservices/axis2/trunk/c/util/src/network_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/network_handler.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/network_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/network_handler.c Wed May 31 08:54:07 2006
@@ -27,7 +27,7 @@
#endif
AXIS2_DECLARE(axis2_socket_t )
-axis2_network_handler_open_socket(axis2_env_t **env, char *server, int port)
+axis2_network_handler_open_socket(const axis2_env_t *env, char *server, int port)
{
axis2_socket_t sock = AXIS2_INVALID_SOCKET;
struct sockaddr_in sock_addr;
@@ -43,12 +43,12 @@
#endif
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, server, AXIS2_CRTICAL_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, server, AXIS2_CRTICAL_FAILURE);
if((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
/*nnn AF_INET is not defined in sys/socket.h but PF_INET*/
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
@@ -69,7 +69,7 @@
((struct in_addr*)lphost->h_addr)->s_addr;
else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_ADDRESS,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_ADDRESS,
AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
@@ -80,7 +80,7 @@
if (connect(sock, (struct sockaddr*)&sock_addr, sizeof(sock_addr)) < 0)
{
AXIS2_CLOSE_SOCKET(sock);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&nodelay,
@@ -92,7 +92,7 @@
}
AXIS2_DECLARE( axis2_socket_t )
-axis2_network_handler_create_server_socket(axis2_env_t **env, int port)
+axis2_network_handler_create_server_socket(const axis2_env_t *env, int port)
{
axis2_socket_t sock = AXIS2_INVALID_SOCKET;
axis2_socket_t i = 0;
@@ -109,7 +109,7 @@
sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock < 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOCKET_ERROR, AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
/** Address re-use */
@@ -128,13 +128,13 @@
/* Bind the socket to our port number */
if (bind(sock, (struct sockaddr*)&sock_addr, sizeof(sock_addr)) < 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOCKET_BIND_FAILED,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOCKET_BIND_FAILED,
AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
if(listen(sock, 50) < 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SOCKET_LISTEN_FAILED,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOCKET_LISTEN_FAILED,
AXIS2_FAILURE);
return AXIS2_INVALID_SOCKET;
}
@@ -142,14 +142,14 @@
}
AXIS2_DECLARE(axis2_status_t )
-axis2_network_handler_close_socket (axis2_env_t **env, axis2_socket_t socket)
+axis2_network_handler_close_socket (const axis2_env_t *env, axis2_socket_t socket)
{
int i = 0;
char buf[32];
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
if(socket < 0)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_SOCKET,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SOCKET,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -160,7 +160,7 @@
}
AXIS2_DECLARE(axis2_status_t)
-axis2_network_handler_set_sock_option(axis2_env_t **env, axis2_socket_t socket,
+axis2_network_handler_set_sock_option(const axis2_env_t *env, axis2_socket_t socket,
int option, int value)
{
if(option == SO_RCVTIMEO || option == SO_SNDTIMEO)
@@ -176,7 +176,7 @@
}
AXIS2_DECLARE(axis2_socket_t)
-axis2_network_handler_svr_socket_accept(axis2_env_t **env,
+axis2_network_handler_svr_socket_accept(const axis2_env_t *env,
axis2_socket_t svr_socket)
{
struct sockaddr cli_addr;
@@ -191,7 +191,7 @@
cli_len = sizeof(cli_addr);
cli_socket = accept(svr_socket, (struct sockaddr *)&cli_addr, &cli_len);
if (cli_socket < 0)
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "[Axis2][network_handler] Socket accept \
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[Axis2][network_handler] Socket accept \
failed");
setsockopt(cli_socket, IPPROTO_TCP, TCP_NODELAY, &nodelay,
@@ -241,7 +241,7 @@
AXIS2_DECLARE(axis2_char_t*)
-axis2_network_handler_get_svr_ip(axis2_env_t **env,
+axis2_network_handler_get_svr_ip(const axis2_env_t *env,
axis2_socket_t socket)
{
struct sockaddr_in addr;
Modified: webservices/axis2/trunk/c/util/src/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Wed May 31 08:54:07 2006
@@ -38,68 +38,68 @@
axis2_char_t* AXIS2_CALL
axis2_param_get_name(axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
void* AXIS2_CALL
axis2_param_get_value(axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_param_set_name(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name);
axis2_status_t AXIS2_CALL
axis2_param_set_value(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value);
axis2_bool_t AXIS2_CALL
axis2_param_is_locked(axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_param_set_locked(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t value);
int AXIS2_CALL
axis2_param_get_param_type(axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_param_set_param_type(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
int type);
axis2_status_t AXIS2_CALL
axis2_param_set_attributes(
axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *attrs);
axis2_hash_t* AXIS2_CALL
axis2_param_get_attributes(
axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_param_free(axis2_param_t *param,
- axis2_env_t **env);
+ const axis2_env_t *env);
/******************************************************************************/
AXIS2_DECLARE(axis2_param_t*)
-axis2_param_create(axis2_env_t **env,
+axis2_param_create(const axis2_env_t *env,
axis2_char_t *name, void *value)
{
axis2_param_impl_t *param_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- param_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_param_impl_t) );
+ param_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_param_impl_t) );
if (!param_impl)
{
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return NULL;
}
@@ -110,11 +110,11 @@
param_impl->attrs = NULL;
param_impl->param.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_param_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_param_ops_t));
if(NULL == param_impl->param.ops)
{
axis2_param_free(&(param_impl->param), 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;
}
param_impl->param.ops->value_free = NULL;
@@ -142,7 +142,7 @@
axis2_char_t* AXIS2_CALL
axis2_param_get_name(axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -151,7 +151,7 @@
void* AXIS2_CALL
axis2_param_get_value(axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -160,7 +160,7 @@
axis2_status_t AXIS2_CALL
axis2_param_set_name(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -171,7 +171,7 @@
axis2_status_t AXIS2_CALL
axis2_param_set_value(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
void *value)
{
void *param_value = NULL;
@@ -186,7 +186,7 @@
}
else /* we assume that param value is axis2_char_t* */
{
- AXIS2_FREE((*env)->allocator, param_value);
+ AXIS2_FREE(env->allocator, param_value);
}
}
AXIS2_INTF_TO_IMPL(param)->value = value;
@@ -195,7 +195,7 @@
axis2_bool_t AXIS2_CALL
axis2_param_is_locked(axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(param)->locked;
@@ -203,7 +203,7 @@
axis2_status_t AXIS2_CALL
axis2_param_set_locked(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_bool_t value)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -214,7 +214,7 @@
int AXIS2_CALL
axis2_param_get_param_type(axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -223,7 +223,7 @@
axis2_status_t AXIS2_CALL
axis2_param_set_param_type(axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
int type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -236,13 +236,13 @@
axis2_status_t AXIS2_CALL
axis2_param_set_attributes(
axis2_param_t *param,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_hash_t *attrs)
{
axis2_param_impl_t *param_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, attrs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, attrs, AXIS2_FAILURE);
param_impl = AXIS2_INTF_TO_IMPL(param);
if(param_impl->attrs)
@@ -268,7 +268,7 @@
axis2_hash_t* AXIS2_CALL
axis2_param_get_attributes(
axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -278,7 +278,7 @@
axis2_status_t AXIS2_CALL
axis2_param_free(axis2_param_t *param,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_param_impl_t *param_impl = NULL;
void *param_value = NULL;
@@ -296,7 +296,7 @@
}
else /* we assume that param value is axis2_char_t* */
{
- AXIS2_FREE((*env)->allocator, param_value);
+ AXIS2_FREE(env->allocator, param_value);
}
}
@@ -314,9 +314,9 @@
axis2_hash_free(param_impl->attrs, env);
}
param_name = axis2_param_get_name(param, env);
- AXIS2_FREE((*env)->allocator, param_name);
- AXIS2_FREE((*env)->allocator, param->ops);
- AXIS2_FREE((*env)->allocator, AXIS2_INTF_TO_IMPL(param));
+ AXIS2_FREE(env->allocator, param_name);
+ AXIS2_FREE(env->allocator, param->ops);
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(param));
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/src/param_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param_container.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Wed May 31 08:54:07 2006
@@ -34,42 +34,42 @@
axis2_status_t AXIS2_CALL
axis2_param_container_free (axis2_param_container_t *param_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_param_container_add_param (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param);
axis2_param_t * AXIS2_CALL
axis2_param_container_get_param (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *name);
axis2_array_list_t * AXIS2_CALL
axis2_param_container_get_params (axis2_param_container_t *param_container,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_param_container_is_param_locked (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *param_name);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_param_container_t *)
-axis2_param_container_create (axis2_env_t **env)
+axis2_param_container_create (const axis2_env_t *env)
{
axis2_param_container_impl_t *param_container_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- param_container_impl = (axis2_param_container_impl_t *) AXIS2_MALLOC((*env)->
+ param_container_impl = (axis2_param_container_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_param_container_impl_t));
if(NULL == param_container_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;
}
@@ -80,16 +80,16 @@
if(NULL == param_container_impl->params)
{
axis2_param_container_free(&(param_container_impl->param_container), 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;
}
param_container_impl->param_container.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_param_container_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_param_container_ops_t));
if(NULL == param_container_impl->param_container.ops)
{
axis2_param_container_free(&(param_container_impl->param_container), 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;
}
@@ -110,7 +110,7 @@
axis2_status_t AXIS2_CALL
axis2_param_container_free (axis2_param_container_t *param_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_param_container_impl_t *param_container_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -120,7 +120,7 @@
param_container_impl = AXIS2_INTF_TO_IMPL(param_container);
if(NULL != param_container->ops)
- AXIS2_FREE((*env)->allocator, param_container->ops);
+ AXIS2_FREE(env->allocator, param_container->ops);
if(NULL != param_container_impl->params)
{
@@ -151,13 +151,13 @@
param_container_impl->params_list = NULL;
}
- AXIS2_FREE((*env)->allocator, param_container_impl);
+ AXIS2_FREE(env->allocator, param_container_impl);
return status;
}
axis2_status_t AXIS2_CALL
axis2_param_container_free_void_arg (void *param_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_param_container_t *param_container_l = NULL;
@@ -168,14 +168,14 @@
axis2_status_t AXIS2_CALL
axis2_param_container_add_param (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_param_t *param)
{
axis2_param_container_impl_t *param_container_impl = NULL;
axis2_char_t *param_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, param, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
param_container_impl = AXIS2_INTF_TO_IMPL(param_container);
if (NULL == param_container_impl->params)
@@ -189,7 +189,7 @@
param_name = AXIS2_PARAM_GET_NAME(param, env);
if(!param_name)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_PARAM,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_PARAM,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -202,7 +202,7 @@
axis2_param_t * AXIS2_CALL
axis2_param_container_get_param (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *name)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -213,7 +213,7 @@
axis2_array_list_t * AXIS2_CALL
axis2_param_container_get_params (axis2_param_container_t *param_container,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_param_container_impl_t *param_container_impl = NULL;
axis2_hash_index_t *index_i = 0;
@@ -228,7 +228,7 @@
param_container_impl->params_list = axis2_array_list_create(env, 0);
if(!param_container_impl->params_list)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return NULL;
}
@@ -252,7 +252,7 @@
axis2_bool_t AXIS2_CALL
axis2_param_container_is_param_locked (axis2_param_container_t *param_container,
- axis2_env_t **env,
+ const axis2_env_t *env,
const axis2_char_t *param_name)
{
axis2_param_t *param = NULL;
Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c Wed May 31 08:54:07 2006
@@ -25,7 +25,7 @@
new = AXIS2_MALLOC(allocator, sizeof(axis2_threadattr_t));
if(NULL == new)
{
- /*AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)*/
+ /*AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE)*/
return NULL;
}
new->detach = 0;
@@ -52,7 +52,7 @@
}
AXIS2_DECLARE(axis2_status_t)
-axis2_threadattr_detach_get(axis2_threadattr_t *attr, axis2_env_t **env)
+axis2_threadattr_detach_get(axis2_threadattr_t *attr, const axis2_env_t *env)
{
if (1 == attr->detach)
{
@@ -194,7 +194,7 @@
}
AXIS2_DECLARE(axis2_os_thread_t)
-axis2_os_thread_get(axis2_thread_t *thd, axis2_env_t **env)
+axis2_os_thread_get(axis2_thread_t *thd, const axis2_env_t *env)
{
return thd->td;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org