You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/08 07:10:17 UTC
svn commit: r515933 - in /webservices/axis2/trunk/c:
modules/core/deployment/ rampart/src/util/ test/core/deployment/
tools/codegen/src/util/ util/include/ util/src/
Author: dinesh
Date: Wed Mar 7 22:10:14 2007
New Revision: 515933
URL: http://svn.apache.org/viewvc?view=rev&rev=515933
Log:
macors removed from dll_desc.c and code formatted
Modified:
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
webservices/axis2/trunk/c/util/src/class_loader.c
webservices/axis2/trunk/c/util/src/dll_desc.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed Mar 7 22:10:14 2007
@@ -466,12 +466,12 @@
class_name = AXIOM_ATTRIBUTE_GET_VALUE(disp_att, env);
dll_desc = axis2_dll_desc_create(env);
dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
/* TODO
* set full dll path here instead of dll lib name only */
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_HANDLER_DLL);
+ axis2_dll_desc_set_name(dll_desc, env, dll_name);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
impl_info_param = axis2_param_create(env, class_name, NULL);
if (!impl_info_param)
{
@@ -791,7 +791,7 @@
}
dll_desc = axis2_dll_desc_create(env);
dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(conf_builder->
@@ -803,9 +803,9 @@
AXIS2_FREE(env->allocator, temp_path);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, path_qualified_dll_name);
+ axis2_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
@@ -1031,7 +1031,7 @@
impl_info_param = axis2_param_create(env, class_name, NULL);
dll_desc = axis2_dll_desc_create(env);
dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc,
env, class_name);
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(conf_builder->
@@ -1044,9 +1044,9 @@
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, path_qualified_dll_name);
+ axis2_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Mar 7 22:10:14 2007
@@ -1273,21 +1273,21 @@
read_in_dll = AXIS2_ARCH_FILE_DATA_GET_MODULE_DLL_NAME(dep_engine_impl->
curr_file, env);
dll_desc = axis2_dll_desc_create(env);
- dll_name = AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ dll_name = axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
read_in_dll);
module_folder = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine_impl->curr_file, env);
timestamp = AXIS2_FILE_GET_TIMESTAMP(module_folder, env);
- AXIS2_DLL_DESC_SET_TIMESTAMP(dll_desc, env, timestamp);
+ axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
module_folder_path = AXIS2_FILE_GET_PATH(module_folder, env);
temp_path = AXIS2_STRACAT(module_folder_path, AXIS2_PATH_SEP_STR, env);
dll_path = AXIS2_STRACAT(temp_path, dll_name, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_dep_engine_load_module_dll; dll path is : %s", dll_path);
- status = AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_path);
+ status = axis2_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
- AXIS2_DLL_DESC_FREE(dll_desc, env);
+ axis2_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
/* free all temp vars */
@@ -1296,7 +1296,7 @@
AXIS2_FREE(env->allocator, dll_path);
dll_path = NULL;
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_MODULE_DLL);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
impl_info_param = axis2_param_create(env, read_in_dll, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
@@ -1372,10 +1372,10 @@
handler_class_name = axis2_handler_desc_get_class_name(handlermd, env);
dll_desc = axis2_dll_desc_create(env);
handler_dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
handler_class_name);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, handler_dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_HANDLER_DLL);
+ axis2_dll_desc_set_name(dll_desc, env, handler_dll_name);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axis2_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
@@ -1403,11 +1403,11 @@
dll_desc = axis2_dll_desc_create(env);
dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
/* TODO set fill dll path here instead of dll lib name only */
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_HANDLER_DLL);
+ axis2_dll_desc_set_name(dll_desc, env, dll_name);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axis2_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 7 22:10:14 2007
@@ -1049,7 +1049,7 @@
{
dll_desc = axis2_dll_desc_create(env);
msg_recv_dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(desc_builder->engine, env);
temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
@@ -1059,9 +1059,9 @@
AXIS2_FREE(env->allocator, temp_path);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
+ axis2_dll_desc_set_name(dll_desc, env, dll_name);
AXIS2_FREE(env->allocator, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_MSG_RECV_DLL);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_MSG_RECV_DLL);
impl_info_param = axis2_param_create(env, class_name, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed Mar 7 22:10:14 2007
@@ -329,38 +329,38 @@
AXIS2_SERVICE_CLASS);
if (!impl_info_param)
{
- AXIS2_DLL_DESC_FREE(dll_desc, env);
+ axis2_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
class_name = AXIS2_PARAM_GET_VALUE(impl_info_param, env);
svc_dll_name =
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
+ axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
arch_file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(builder_impl->
svc_builder.desc_builder->engine, env);
svc_folder = AXIS2_ARCH_FILE_DATA_GET_FILE(arch_file_data, env);
timestamp = AXIS2_FILE_GET_TIMESTAMP(svc_folder, env);
- AXIS2_DLL_DESC_SET_TIMESTAMP(dll_desc, env, timestamp);
+ axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
svc_folder_path = AXIS2_FILE_GET_PATH(svc_folder, env);
dll_path = axis2_strcat(env, svc_folder_path, AXIS2_PATH_SEP_STR,
svc_dll_name, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
- status = AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_path);
+ status = axis2_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
- AXIS2_DLL_DESC_FREE(dll_desc, env);
+ axis2_dll_desc_free(dll_desc, env);
return status;
}
AXIS2_FREE(env->allocator, dll_path);
dll_path = NULL;
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_SVC_DLL);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_SVC_DLL);
status = AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
if (AXIS2_SUCCESS != status)
{
- AXIS2_DLL_DESC_FREE(dll_desc, env);
+ axis2_dll_desc_free(dll_desc, env);
return status;
}
/* end of my logic */
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_util.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_util.c Wed Mar 7 22:10:14 2007
@@ -51,7 +51,7 @@
void *ptr = NULL;
dll_desc = axis2_dll_desc_create(env);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, module_name);
+ axis2_dll_desc_set_name(dll_desc, env, module_name);
impl_info_param = axis2_param_create(env, NULL, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
axis2_class_loader_init(env);
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Wed Mar 7 22:10:14 2007
@@ -148,8 +148,8 @@
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
dll_name = AXIS2_STRACAT(axis2c_home, "/lib/libaxis2_http_receiver.so", env);
printf("transport receiver name:%s\n", dll_name);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
+ axis2_dll_desc_set_name(dll_desc, env, dll_name);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_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);
@@ -182,8 +182,8 @@
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
dll_name = AXIS2_STRACAT(axis2c_home, "/lib/libaxis2_http_sender.so", env);
printf("transport sender name:%s\n", dll_name);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
+ axis2_dll_desc_set_name(dll_desc, env, dll_name);
+ axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_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);
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Wed Mar 7 22:10:14 2007
@@ -42,7 +42,7 @@
*pdll_desc = dll_desc;
dll_name=
- AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(
+ axis2_dll_desc_create_platform_specific_dll_name(
dll_desc, env, class_name );
if ( NULL == dll_name )
{
@@ -52,8 +52,8 @@
file_path = w2c_string_add_string(file_path, inter_path, env );
file_path = w2c_string_add_string(file_path, dll_name, env );
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, file_path);
- AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, -1); /* not a standard type */
+ axis2_dll_desc_set_name(dll_desc, env, file_path);
+ axis2_dll_desc_set_type(dll_desc, env, -1); /* not a standard type */
impl_info_param = axis2_param_create(env, NULL, NULL);
AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
@@ -74,7 +74,7 @@
AXIS2_PARAM_CHECK(env->error, dll_desc, AXIS2_FAILURE);
axis2_class_loader_delete_dll(env, dll_desc);
- /*AXIS2_DLL_DESC_FREE ( dll_desc, env );*/
+ /*axis2_dll_desc_free ( dll_desc, env );*/
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_dll_desc.h?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dll_desc.h Wed Mar 7 22:10:14 2007
@@ -171,63 +171,6 @@
const axis2_env_t *env,
const axis2_char_t *class_name);
-
-#define AXIS2_DLL_DESC_FREE(dll_desc, env) \
- axis2_dll_desc_free(dll_desc, env)
-
-#define AXIS2_DLL_DESC_GET_NAME(dll_desc, env) \
- axis2_dll_desc_get_name(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_NAME(dll_desc, env, name) \
- axis2_dll_desc_set_name(dll_desc, env, name)
-
-#define AXIS2_DLL_DESC_GET_TYPE(dll_desc, env) \
- axis2_dll_desc_get_type(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, type) \
- axis2_dll_desc_set_type(dll_desc, env, type)
-
-#define AXIS2_DLL_DESC_GET_LOAD_OPTIONS(dll_desc, env) \
- axis2_dll_desc_get_load_options(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_LOAD_OPTIONS(dll_desc, env, load_options) \
- axis2_dll_desc_set_load_options(dll_desc, env, load_options)
-
-#define AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env) \
- axis2_dll_desc_get_dl_handler(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_DL_HANDLER(dll_desc, env, dl_handler) \
- axis2_dll_desc_set_dl_handler(dll_desc, env, dl_handler)
-
-#define AXIS2_DLL_DESC_GET_CREATE_FUNCT(dll_desc, env) \
- axis2_dll_desc_get_create_funct(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_CREATE_FUNCT(dll_desc, env, funct) \
- axis2_dll_desc_set_create_funct(dll_desc, env, funct)
-
-#define AXIS2_DLL_DESC_GET_DELETE_FUNCT(dll_desc, env) \
- axis2_dll_desc_get_delete_funct((dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_DELETE_FUNCT(dll_desc, env, funct) \
- axis2_dll_desc_set_delete_funct(dll_desc, env, funct)
-
-#define AXIS2_DLL_DESC_GET_TIMESTAMP(dll_desc, env) \
- axis2_dll_desc_get_timestamp(dll_desc, env)
-
-#define AXIS2_DLL_DESC_SET_TIMESTAMP(dll_desc, env, timestamp) \
- axis2_dll_desc_set_timestamp(dll_desc, env, timestamp)
-
-#define AXIS2_DLL_DESC_SET_ERROR_CODE(dll_desc, env, error_code) \
- axis2_dll_desc_set_error_code(dll_desc, env, error_code)
-
-#define AXIS2_DLL_DESC_GET_ERROR_CODE(dll_desc, env) \
- axis2_dll_desc_get_error_code(dll_desc, env)
-
-#define AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env, class_name) \
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env, class_name)
-
- /** @} */
-
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/util/src/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/util/src/class_loader.c (original)
+++ webservices/axis2/trunk/c/util/src/class_loader.c Wed Mar 7 22:10:14 2007
@@ -74,7 +74,7 @@
AXIS2_FAILURE);
return NULL;
}
- dl_handler = AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env);
+ dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
if (NULL == dl_handler)
{
status = axis2_class_loader_load_lib(env, dll_desc);
@@ -84,7 +84,7 @@
AXIS2_FAILURE);
return NULL;
}
- dl_handler = AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env);
+ dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
if (!dl_handler)
{
return NULL;
@@ -96,7 +96,7 @@
{
return NULL;
}
- status = AXIS2_DLL_DESC_SET_CREATE_FUNCT(dll_desc, env, create_funct);
+ status = axis2_dll_desc_set_create_funct(dll_desc, env, create_funct);
if (AXIS2_FAILURE == status)
{
axis2_class_loader_unload_lib(env, dll_desc);
@@ -111,7 +111,7 @@
{
return NULL;
}
- status = AXIS2_DLL_DESC_SET_DELETE_FUNCT(dll_desc, env, delete_funct);
+ status = axis2_dll_desc_set_delete_funct(dll_desc, env, delete_funct);
if (AXIS2_FAILURE == status)
{
axis2_class_loader_unload_lib(env, dll_desc);
@@ -120,18 +120,18 @@
return NULL;
}
}
- create_funct = AXIS2_DLL_DESC_GET_CREATE_FUNCT(dll_desc, env);
+ create_funct = axis2_dll_desc_get_create_funct(dll_desc, env);
if (!create_funct)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_DLL_DESC,
AXIS2_FAILURE);
return NULL;
}
- dll_type = AXIS2_DLL_DESC_GET_TYPE(dll_desc, env);
+ dll_type = axis2_dll_desc_get_type(dll_desc, env);
/* TODO Following blocks differ only by error message. Try to
* reduce them into one block
*/
- error_code = AXIS2_DLL_DESC_GET_ERROR_CODE(dll_desc, env) ;
+ error_code = axis2_dll_desc_get_error_code(dll_desc, env) ;
if (AXIS2_SVC_DLL == dll_type)
{
create_funct(&svc_skeli, env);
@@ -247,7 +247,7 @@
AXIS2_DLHANDLER dl_handler = NULL;
axis2_status_t status = AXIS2_FAILURE;
- dll_name = AXIS2_DLL_DESC_GET_NAME(dll_desc, env);
+ dll_name = axis2_dll_desc_get_name(dll_desc, env);
dl_handler = AXIS2_PLATFORM_LOADLIB(dll_name);
if (NULL == dl_handler)
{
@@ -261,7 +261,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- status = AXIS2_DLL_DESC_SET_DL_HANDLER(dll_desc, env, dl_handler);
+ status = axis2_dll_desc_set_dl_handler(dll_desc, env, dl_handler);
if (AXIS2_SUCCESS != status)
{
@@ -279,7 +279,7 @@
axis2_class_loader_unload_lib(const axis2_env_t *env,
axis2_dll_desc_t *dll_desc)
{
- AXIS2_DLHANDLER dl_handler = AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env);
+ AXIS2_DLHANDLER dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
if (dl_handler)
{
AXIS2_PLATFORM_UNLOADLIB(dl_handler);
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?view=diff&rev=515933&r1=515932&r2=515933
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Wed Mar 7 22:10:14 2007
@@ -43,7 +43,7 @@
dll_desc = (axis2_dll_desc_t *) AXIS2_MALLOC(env->allocator
, sizeof(axis2_dll_desc_t));
- if (NULL == dll_desc)
+ if (!dll_desc)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -78,24 +78,17 @@
if (dll_desc->dll_name)
{
AXIS2_FREE(env->allocator, dll_desc->dll_name);
- dll_desc->dll_name = NULL;
}
if (dll_desc->path_qualified_dll_name)
{
AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
- dll_desc->path_qualified_dll_name = NULL;
}
- dll_desc->create_funct = NULL;
- dll_desc->delete_funct = NULL;
-
if (dll_desc)
{
AXIS2_FREE(env->allocator, dll_desc);
- dll_desc = NULL;
}
-
return AXIS2_SUCCESS;
}
@@ -121,8 +114,8 @@
if (dll_desc->path_qualified_dll_name)
{
AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
- dll_desc->path_qualified_dll_name = NULL;
}
+
dll_desc->path_qualified_dll_name = AXIS2_STRDUP(name, env);
if (!dll_desc->path_qualified_dll_name)
{
@@ -135,7 +128,6 @@
axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return dll_desc->path_qualified_dll_name;
}
@@ -165,7 +157,6 @@
axis2_dll_desc_get_type(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return dll_desc->dll_type;
}
@@ -173,7 +164,6 @@
axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return dll_desc->load_options;
}
@@ -188,7 +178,6 @@
if (dll_desc->dl_handler)
{
AXIS2_FREE(env->allocator, dll_desc->dl_handler);
- dll_desc->dl_handler = NULL;
}
dll_desc->dl_handler = dl_handler;
return AXIS2_SUCCESS;
@@ -198,7 +187,6 @@
axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return dll_desc->dl_handler;
}
@@ -208,7 +196,6 @@
CREATE_FUNCT funct)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
dll_desc->create_funct = funct;
return AXIS2_SUCCESS;
}
@@ -217,7 +204,6 @@
axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return dll_desc->create_funct;
}
@@ -236,7 +222,6 @@
axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return dll_desc->delete_funct;
}
@@ -246,7 +231,6 @@
AXIS2_TIME_T timestamp)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
dll_desc->timestamp = timestamp;
return AXIS2_SUCCESS;
}
@@ -255,7 +239,6 @@
axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return dll_desc->timestamp;
}
@@ -277,8 +260,6 @@
axis2_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
return dll_desc->error_code;
}
@@ -296,5 +277,3 @@
AXIS2_FREE(env->allocator, temp_name);
return dll_desc->dll_name;
}
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org