axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r492947 - in /webservices/axis2/trunk/c/util: include/axis2_dll_desc.h src/dll_desc.c
Date Fri, 05 Jan 2007 09:34:05 GMT
Author: samisa
Date: Fri Jan  5 01:34:04 2007
New Revision: 492947

URL: http://svn.apache.org/viewvc?view=rev&rev=492947
Log:
Removed ops

Modified:
    webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
    webservices/axis2/trunk/c/util/src/dll_desc.c

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=492947&r1=492946&r2=492947
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dll_desc.h Fri Jan  5 01:34:04 2007
@@ -40,10 +40,7 @@
      * @{
      */
 
-
     typedef struct axis2_dll_desc axis2_dll_desc_t;
-    typedef struct axis2_dll_desc_ops axis2_dll_desc_ops_t;
-
 
     typedef int(*CREATE_FUNCT)(void **inst, const axis2_env_t *env);
 
@@ -68,187 +65,166 @@
     axis2_dll_type_t;
 
     /**
-     *   \brief DLL Description ops struct
+     * creates dll_desc struct
+     * @param qname qname, can be NULL
      */
-    struct axis2_dll_desc_ops
-    {
-        axis2_status_t(AXIS2_CALL *
-                free)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        /**
-         * Set path qualified platform specific dll name
-         */
-        axis2_status_t(AXIS2_CALL *
-                set_name)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        axis2_char_t *name);
-
-        /**
-         * Return the path qualified platform specific dll name
-         */
-        axis2_char_t *(AXIS2_CALL *
-                get_name)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_type)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        axis2_dll_type_t type);
-
-        axis2_dll_type_t(AXIS2_CALL *
-                get_type)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_load_options)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        int options);
-
-        int(AXIS2_CALL *
-                get_load_options)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_dl_handler)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        AXIS2_DLHANDLER dl_handler);
-
-        AXIS2_DLHANDLER(AXIS2_CALL *
-                get_dl_handler)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_create_funct)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        CREATE_FUNCT funct);
-
-        CREATE_FUNCT(AXIS2_CALL *
-                get_create_funct)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_delete_funct)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        DELETE_FUNCT funct);
-
-        DELETE_FUNCT(AXIS2_CALL *
-                get_delete_funct)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-
-        axis2_status_t(AXIS2_CALL *
-                set_timestamp)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        AXIS2_TIME_T timestamp);
-
-        axis2_status_t(AXIS2_CALL *
-                set_error_code)(
-                    axis2_dll_desc_t *dll_desc,
-                    const axis2_env_t *env,
-                    axis2_error_codes_t error_code);
-
-        axis2_error_codes_t(AXIS2_CALL *
-                get_error_code)(
-                    axis2_dll_desc_t *dll_desc,
-                    const axis2_env_t *env);
-
-        AXIS2_TIME_T(AXIS2_CALL *
-                get_timestamp)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env);
-        /**
-        * This function will accept the library name without any platform
-        * dependant prefixes or suffixes. It then prefix and suffix
-        * platform dependant prefix and suffix macros to the original name
-        * and return the platform specific dll name
-        *
-        * @param class_name
-        * @return platform specific dll name
-        */
-        axis2_char_t *(AXIS2_CALL *
-                create_platform_specific_dll_name)(axis2_dll_desc_t *dll_desc,
-                        const axis2_env_t *env,
-                        const axis2_char_t *class_name);
+    AXIS2_EXTERN axis2_dll_desc_t* AXIS2_CALL
+    axis2_dll_desc_create(const axis2_env_t *env);
 
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_free_void_arg(void *dll_desc,
+        const axis2_env_t *env);
 
-    };
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_free(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
 
     /**
-    * \brief DLL Description struct
-    */
-    struct axis2_dll_desc
-    {
-        /** DLL Description related ops */
-        axis2_dll_desc_ops_t *ops;
-
-    };
-
+     * Set path qualified platform specific dll name
+     */
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        axis2_char_t *name);
 
     /**
-     * creates dll_desc struct
-     * @param qname qname, can be NULL
+     * Return the path qualified platform specific dll name
      */
-    AXIS2_EXTERN axis2_dll_desc_t* AXIS2_CALL
-    axis2_dll_desc_create(const axis2_env_t *env);
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL
+    axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
 
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    axis2_dll_desc_free_void_arg(void *dll_desc,
-            const axis2_env_t *env);
+    axis2_dll_desc_set_type(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        axis2_dll_type_t type);
+
+    AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
+    axis2_dll_desc_get_type(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        int options);
+
+    AXIS2_EXTERN int AXIS2_CALL
+    axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        AXIS2_DLHANDLER dl_handler);
+
+    AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
+    axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        CREATE_FUNCT funct);
+
+    AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
+    axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        DELETE_FUNCT funct);
+
+    AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
+    axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_timestamp(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        AXIS2_TIME_T timestamp);
+
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
+    axis2_dll_desc_set_error_code(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        axis2_error_codes_t error_code);
+
+    AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
+    axis2_dll_desc_get_error_code(
+        axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+
+    AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
+    axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env);
+    /**
+    * This function will accept the library name without any platform
+    * dependant prefixes or suffixes. It then prefix and suffix
+    * platform dependant prefix and suffix macros to the original name
+    * and return the platform specific dll name
+    *
+    * @param class_name
+    * @return platform specific dll name
+    */
+    AXIS2_EXTERN axis2_char_t * AXIS2_CALL 
+    axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
+        const axis2_env_t *env,
+        const axis2_char_t *class_name);
 
-    /******************************************************************************/
 
 #define AXIS2_DLL_DESC_FREE(dll_desc, env) \
-    ((dll_desc)->ops->free(dll_desc, env))
+    axis2_dll_desc_free(dll_desc, env)
 
 #define AXIS2_DLL_DESC_GET_NAME(dll_desc, env) \
-    ((dll_desc)->ops->get_name(dll_desc, env))
+    axis2_dll_desc_get_name(dll_desc, env)
 
 #define AXIS2_DLL_DESC_SET_NAME(dll_desc, env, name) \
-    ((dll_desc)->ops->set_name(dll_desc, env, name))
+    axis2_dll_desc_set_name(dll_desc, env, name)
 
 #define AXIS2_DLL_DESC_GET_TYPE(dll_desc, env) \
-    ((dll_desc)->ops->get_type(dll_desc, env))
+    axis2_dll_desc_get_type(dll_desc, env)
 
 #define AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, type) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->get_timestamp(dll_desc, env))
+    axis2_dll_desc_get_timestamp(dll_desc, env)
 
 #define AXIS2_DLL_DESC_SET_TIMESTAMP(dll_desc, env, timestamp) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->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) \
-    ((dll_desc)->ops->create_platform_specific_dll_name(dll_desc, env, class_name))
+    axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env, class_name)
 
     /** @} */
 

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=492947&r1=492946&r2=492947
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Fri Jan  5 01:34:04 2007
@@ -18,14 +18,8 @@
 #include <axis2_dll_desc.h>
 #include <axis2_class_loader.h>
 
-/**
- * @brief DLL Description struct impl
- * Axis2 DLL Description impl
- */
-typedef struct axis2_dll_desc_impl
+struct axis2_dll_desc
 {
-    axis2_dll_desc_t dll_desc;
-
     axis2_char_t *dll_name;
     axis2_char_t *path_qualified_dll_name;
     axis2_dll_type_t dll_type;
@@ -37,203 +31,75 @@
     axis2_error_codes_t error_code;
 
 
-}
-axis2_dll_desc_impl_t;
-
-#define AXIS2_INTF_TO_IMPL(dll_desc) ((axis2_dll_desc_impl_t *) dll_desc)
-
-/*************************** Function headers *********************************/
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_free(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
-
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
-        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,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_type(axis2_dll_desc_t *dll_desc,
-        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,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
-        int options);
-
-int AXIS2_CALL
-axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
-        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,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
-        CREATE_FUNCT funct);
-
-CREATE_FUNCT AXIS2_CALL
-axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
-        DELETE_FUNCT funct);
-
-DELETE_FUNCT AXIS2_CALL
-axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_timestamp(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
-        AXIS2_TIME_T timestamp);
-
-axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_error_code(
-    axis2_dll_desc_t *dll_desc,
-    const axis2_env_t *env,
-    axis2_error_codes_t error_code);
-
-axis2_error_codes_t AXIS2_CALL
-axis2_dll_desc_get_error_code(
-    axis2_dll_desc_t *dll_desc,
-    const axis2_env_t *env);
-
-AXIS2_TIME_T AXIS2_CALL
-axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env);
-axis2_char_t * AXIS2_CALL
-axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
-        const axis2_env_t *env,
-        const axis2_char_t *class_name);
-
-/************************* End of function headers ****************************/
+};
 
 AXIS2_EXTERN axis2_dll_desc_t * AXIS2_CALL
 axis2_dll_desc_create(const axis2_env_t *env)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+    axis2_dll_desc_t *dll_desc = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC(env->allocator
-            , sizeof(axis2_dll_desc_impl_t));
+    dll_desc = (axis2_dll_desc_t *) AXIS2_MALLOC(env->allocator
+            , sizeof(axis2_dll_desc_t));
 
-    if (NULL == dll_desc_impl)
+    if (NULL == dll_desc)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
 
-    dll_desc_impl->dll_name = NULL;
-    dll_desc_impl->path_qualified_dll_name = NULL;
-    dll_desc_impl->dll_type = 0;
-    dll_desc_impl->load_options = 0;
-    dll_desc_impl->dl_handler = NULL;
-    dll_desc_impl->create_funct = NULL;
-    dll_desc_impl->delete_funct = NULL;
-    dll_desc_impl->dll_desc.ops = NULL;
-    dll_desc_impl->timestamp = 0;
-    dll_desc_impl->error_code = AXIS2_ERROR_NONE;
-
-    dll_desc_impl->dll_desc.ops = (axis2_dll_desc_ops_t *) AXIS2_MALLOC(
-                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);
-        return NULL;
-    }
+    dll_desc->dll_name = NULL;
+    dll_desc->path_qualified_dll_name = NULL;
+    dll_desc->dll_type = 0;
+    dll_desc->load_options = 0;
+    dll_desc->dl_handler = NULL;
+    dll_desc->create_funct = NULL;
+    dll_desc->delete_funct = NULL;
+    dll_desc->timestamp = 0;
+    dll_desc->error_code = AXIS2_ERROR_NONE;
 
-    dll_desc_impl->dll_desc.ops->free = axis2_dll_desc_free;
-    dll_desc_impl->dll_desc.ops->get_name = axis2_dll_desc_get_name;
-    dll_desc_impl->dll_desc.ops->set_name = axis2_dll_desc_set_name;
-    dll_desc_impl->dll_desc.ops->get_load_options = axis2_dll_desc_get_load_options;
-    dll_desc_impl->dll_desc.ops->set_load_options = axis2_dll_desc_set_load_options;
-    dll_desc_impl->dll_desc.ops->get_dl_handler = axis2_dll_desc_get_dl_handler;
-    dll_desc_impl->dll_desc.ops->set_dl_handler = axis2_dll_desc_set_dl_handler;
-    dll_desc_impl->dll_desc.ops->get_create_funct = axis2_dll_desc_get_create_funct;
-    dll_desc_impl->dll_desc.ops->set_create_funct = axis2_dll_desc_set_create_funct;
-    dll_desc_impl->dll_desc.ops->get_delete_funct = axis2_dll_desc_get_delete_funct;
-    dll_desc_impl->dll_desc.ops->set_delete_funct = axis2_dll_desc_set_delete_funct;
-    dll_desc_impl->dll_desc.ops->set_type = axis2_dll_desc_set_type;
-    dll_desc_impl->dll_desc.ops->get_type = axis2_dll_desc_get_type;
-    dll_desc_impl->dll_desc.ops->get_timestamp = axis2_dll_desc_get_timestamp;
-    dll_desc_impl->dll_desc.ops->set_timestamp = axis2_dll_desc_set_timestamp;
-    dll_desc_impl->dll_desc.ops->set_error_code = axis2_dll_desc_set_error_code;
-    dll_desc_impl->dll_desc.ops->get_error_code = axis2_dll_desc_get_error_code;
-    dll_desc_impl->dll_desc.ops->create_platform_specific_dll_name =
-        axis2_dll_desc_create_platform_specific_dll_name;
-    return &(dll_desc_impl->dll_desc);
+    return dll_desc;
 }
 
 /******************************************************************************/
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_free(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
-    if (dll_desc_impl->dl_handler)
+    if (dll_desc->dl_handler)
     {
         axis2_class_loader_delete_dll(env, dll_desc);
     }
 
-    if (dll_desc_impl->dll_name)
+    if (dll_desc->dll_name)
     {
-        AXIS2_FREE(env->allocator, dll_desc_impl->dll_name);
-        dll_desc_impl->dll_name = NULL;
+        AXIS2_FREE(env->allocator, dll_desc->dll_name);
+        dll_desc->dll_name = NULL;
     }
 
-    if (dll_desc_impl->path_qualified_dll_name)
+    if (dll_desc->path_qualified_dll_name)
     {
-        AXIS2_FREE(env->allocator, dll_desc_impl->path_qualified_dll_name);
-        dll_desc_impl->path_qualified_dll_name = NULL;
+        AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
+        dll_desc->path_qualified_dll_name = NULL;
     }
 
-    if (dll_desc->ops)
-    {
-        AXIS2_FREE(env->allocator, dll_desc->ops);
-        dll_desc->ops = NULL;
-    }
-    dll_desc_impl->create_funct = NULL;
-    dll_desc_impl->delete_funct = NULL;
+    dll_desc->create_funct = NULL;
+    dll_desc->delete_funct = NULL;
 
-    if (dll_desc_impl)
+    if (dll_desc)
     {
-        AXIS2_FREE(env->allocator, dll_desc_impl);
-        dll_desc_impl = NULL;
+        AXIS2_FREE(env->allocator, dll_desc);
+        dll_desc = NULL;
     }
 
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_free_void_arg(void *dll_desc,
         const axis2_env_t *env)
 {
@@ -244,227 +110,191 @@
     return axis2_dll_desc_free(dll_desc_l, env);
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
         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);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
-    if (dll_desc_impl->path_qualified_dll_name)
+    if (dll_desc->path_qualified_dll_name)
     {
-        AXIS2_FREE(env->allocator, dll_desc_impl->path_qualified_dll_name);
-        dll_desc_impl->path_qualified_dll_name = NULL;
+        AXIS2_FREE(env->allocator, dll_desc->path_qualified_dll_name);
+        dll_desc->path_qualified_dll_name = NULL;
     }
-    dll_desc_impl->path_qualified_dll_name = AXIS2_STRDUP(name, env);
-    if (!dll_desc_impl->path_qualified_dll_name)
+    dll_desc->path_qualified_dll_name = AXIS2_STRDUP(name, env);
+    if (!dll_desc->path_qualified_dll_name)
     {
         return AXIS2_FAILURE;
     }
     return AXIS2_SUCCESS;
 }
 
-axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->path_qualified_dll_name;
+    return dll_desc->path_qualified_dll_name;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         int options)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
-
-
-    dll_desc_impl->load_options = options;
+    dll_desc->load_options = options;
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_type(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         axis2_dll_type_t type)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
-
-
-    dll_desc_impl->dll_type = type;
+    dll_desc->dll_type = type;
     return AXIS2_SUCCESS;
 }
 
-axis2_dll_type_t AXIS2_CALL
+AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
 axis2_dll_desc_get_type(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->dll_type;
+    return dll_desc->dll_type;
 }
 
-int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
 axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->load_options;
+    return dll_desc->load_options;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
         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);
 
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
-
-    if (dll_desc_impl->dl_handler)
+    if (dll_desc->dl_handler)
     {
-        AXIS2_FREE(env->allocator, dll_desc_impl->dl_handler);
-        dll_desc_impl->dl_handler = NULL;
+        AXIS2_FREE(env->allocator, dll_desc->dl_handler);
+        dll_desc->dl_handler = NULL;
     }
-    dll_desc_impl->dl_handler = dl_handler;
+    dll_desc->dl_handler = dl_handler;
     return AXIS2_SUCCESS;
 }
 
-AXIS2_DLHANDLER AXIS2_CALL
+AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
 axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->dl_handler;
+    return dll_desc->dl_handler;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         CREATE_FUNCT funct)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
-
-
-    dll_desc_impl->create_funct = funct;
+    dll_desc->create_funct = funct;
     return AXIS2_SUCCESS;
 }
 
-CREATE_FUNCT AXIS2_CALL
+AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
 axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->create_funct;
+    return dll_desc->create_funct;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         DELETE_FUNCT funct)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
-
-
-    dll_desc_impl->delete_funct = funct;
+    dll_desc->delete_funct = funct;
     return AXIS2_SUCCESS;
 }
 
-DELETE_FUNCT AXIS2_CALL
+AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
 axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, NULL);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->delete_funct;
+    return dll_desc->delete_funct;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_timestamp(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         AXIS2_TIME_T timestamp)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
-    dll_desc_impl->timestamp = timestamp;
+    dll_desc->timestamp = timestamp;
     return AXIS2_SUCCESS;
 }
 
-AXIS2_TIME_T AXIS2_CALL
+AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
 axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    return AXIS2_INTF_TO_IMPL(dll_desc)->timestamp;
+    return dll_desc->timestamp;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_dll_desc_set_error_code(
     axis2_dll_desc_t *dll_desc,
     const axis2_env_t *env,
     axis2_error_codes_t error_code)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
-    dll_desc_impl->error_code = error_code;
+    dll_desc->error_code = error_code;
 
     return AXIS2_SUCCESS;
 }
 
-axis2_error_codes_t AXIS2_CALL
+AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
 axis2_dll_desc_get_error_code(
     axis2_dll_desc_t *dll_desc,
     const axis2_env_t *env)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
-
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
-    return dll_desc_impl->error_code;
+    return dll_desc->error_code;
 }
 
-axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
 axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
         const axis2_env_t *env,
         const axis2_char_t *class_name)
 {
-    axis2_dll_desc_impl_t *dll_desc_impl = NULL;
     axis2_char_t *temp_name = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
-    dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
 
     temp_name = AXIS2_STRACAT(AXIS2_LIB_PREFIX, class_name, env);
-    dll_desc_impl->dll_name = AXIS2_STRACAT(temp_name, AXIS2_LIB_SUFFIX, env);
+    dll_desc->dll_name = AXIS2_STRACAT(temp_name, AXIS2_LIB_SUFFIX, env);
     AXIS2_FREE(env->allocator, temp_name);
-    return dll_desc_impl->dll_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


Mime
View raw message