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 di...@apache.org on 2007/03/08 06:00:48 UTC
svn commit: r515925 - in /webservices/axis2/trunk/c: build.sh
modules/core/deployment/repos_listener.c util/include/axis2_dir_handler.h
util/src/dir_handler.c util/test/util/test_util.c
Author: dinesh
Date: Wed Mar 7 21:00:47 2007
New Revision: 515925
URL: http://svn.apache.org/viewvc?view=rev&rev=515925
Log:
code formatting , dir_handler.c
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
webservices/axis2/trunk/c/util/src/dir_handler.c
webservices/axis2/trunk/c/util/test/util/test_util.c
Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build.sh?view=diff&rev=515925&r1=515924&r2=515925
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Wed Mar 7 21:00:47 2007
@@ -7,7 +7,7 @@
echo "AXIS2C_HOME = ${AXIS2C_HOME}"
-./configure --prefix=${AXIS2C_HOME}
+./configure --prefix=${AXIS2C_HOME} --enable-rampart=yes
make
make install
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=515925&r1=515924&r2=515925
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Wed Mar 7 21:00:47 2007
@@ -345,7 +345,7 @@
AXIS2_PARAM_CHECK(env->error, folder_name, AXIS2_FAILURE);
listener_impl = AXIS2_INTF_TO_IMPL(listener);
- current_info_list = AXIS2_DIR_HANDLER_LIST_SERVICE_OR_MODULE_DIRS(env,
+ current_info_list = axis2_dir_handler_list_service_or_module_dirs(env,
folder_name);
if (!current_info_list)
{
Modified: webservices/axis2/trunk/c/util/include/axis2_dir_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_dir_handler.h?view=diff&rev=515925&r1=515924&r2=515925
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dir_handler.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_dir_handler.h Wed Mar 7 21:00:47 2007
@@ -61,19 +61,6 @@
#define AXIS2_AAR_SUFFIX ".aar"
#define AXIS2_MAR_SUFFIX ".mar"
-
- /***********************Function Macros****************************************/
-
-#define AXIS2_DIR_HANDLER_LIST_SERVICES_OR_MODULES_IN_DIR(env, pathname) \
- (axis2_dir_handler_list_services_or_modules_in_dir(env, pathname))
-
-#define AXIS2_DIR_HANDLER_LIST_SERVICE_OR_MODULE_DIRS(env, pathname) \
- (axis2_dir_handler_list_service_or_module_dirs(env, pathname))
-
- /** @} */
-
-
-
#ifdef __cplusplus
}
#endif
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?view=diff&rev=515925&r1=515924&r2=515925
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Wed Mar 7 21:00:47 2007
@@ -54,7 +54,6 @@
if (count <= 0)
{
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);
return NULL;
}
@@ -79,10 +78,8 @@
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -97,16 +94,13 @@
axis2_file_t *del_file = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -119,18 +113,14 @@
axis2_file_t *del_file = NULL;
AXIS2_FREE(env->allocator, path);
- path = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -144,27 +134,20 @@
axis2_file_t *del_file = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
AXIS2_FREE(env->allocator, path);
- path = NULL;
AXIS2_FREE(env->allocator, buf);
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
return NULL;
}
AXIS2_FREE(env->allocator, path);
- path = NULL;
AXIS2_FREE(env->allocator, buf);
- buf = NULL;
- arch_file = NULL;
- fname = NULL;
+
}
return file_list;
}
@@ -230,15 +213,12 @@
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
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);
if (!path)
@@ -248,21 +228,17 @@
axis2_file_t *del_file = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
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));
if (!buf)
@@ -272,18 +248,14 @@
axis2_file_t *del_file = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
AXIS2_FREE(env->allocator, path);
- path = NULL;
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -297,29 +269,19 @@
axis2_file_t *del_file = NULL;
AXIS2_FILE_FREE(arch_file, env);
- arch_file = NULL;
AXIS2_FREE(env->allocator, path);
- path = NULL;
AXIS2_FREE(env->allocator, buf);
- buf = NULL;
size = axis2_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
AXIS2_FILE_FREE(del_file, env);
- del_file = NULL;
}
axis2_array_list_free(file_list, env);
- file_list = NULL;
return NULL;
-
}
AXIS2_FREE(env->allocator, path);
- path = NULL;
AXIS2_FREE(env->allocator, buf);
- buf = NULL;
- arch_file = NULL;
- fname = NULL;
}
#ifndef WIN32
for (i = 0; i < count; i++)
Modified: webservices/axis2/trunk/c/util/test/util/test_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_util.c?view=diff&rev=515925&r1=515924&r2=515925
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Wed Mar 7 21:00:47 2007
@@ -118,7 +118,7 @@
axis2_char_t *pathname = AXIS2_STRDUP("/tmp/test/", env);
- axis2_array_list_t *arr_folders = AXIS2_DIR_HANDLER_LIST_SERVICE_OR_MODULE_DIRS(env, pathname);
+ axis2_array_list_t *arr_folders = axis2_dir_handler_list_service_or_module_dirs(env, pathname);
if (arr_folders == NULL)
{
printf("List of folders is NULL\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org