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 pi...@apache.org on 2007/03/30 20:13:57 UTC
svn commit: r524214 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/engine/ util/include/ util/src/
util/test/util/
Author: pini
Date: Fri Mar 30 11:13:56 2007
New Revision: 524214
URL: http://svn.apache.org/viewvc?view=rev&rev=524214
Log:
Fixing jira issue 292
Added:
webservices/axis2/trunk/c/util/include/axutil_file.h
- copied, changed from r524208, webservices/axis2/trunk/c/util/include/axis2_file.h
Removed:
webservices/axis2/trunk/c/util/include/axis2_file.h
Modified:
webservices/axis2/trunk/c/include/axis2_util.h
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/util/src/dir_handler.c
webservices/axis2/trunk/c/util/src/file.c
webservices/axis2/trunk/c/util/test/util/test_util.c
Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 11:13:56 2007
@@ -25,7 +25,7 @@
#include <axutil_dll_desc.h>
#include <axutil_env.h>
#include <axutil_error.h>
-#include <axis2_file.h>
+#include <axutil_file.h>
#include <axutil_file_handler.h>
#include <axis2_hash.h>
#include <axis2_linked_list.h>
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Fri Mar 30 11:13:56 2007
@@ -21,7 +21,7 @@
struct axis2_arch_file_data
{
- axis2_file_t *file;
+ axutil_file_t *file;
int type;
axis2_char_t *msg_recv;
axis2_char_t *module_name;
@@ -77,7 +77,7 @@
AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
axis2_arch_file_data_create_with_type_and_file(const axutil_env_t *env,
int type,
- axis2_file_t *file)
+ axutil_file_t *file)
{
axis2_arch_file_data_t *arch_file_data = NULL;
arch_file_data = (axis2_arch_file_data_t *)
@@ -89,7 +89,7 @@
}
arch_file_data->type = type;
- arch_file_data->file = axis2_file_clone(file, env);
+ arch_file_data->file = axutil_file_clone(file, env);
return arch_file_data;
}
@@ -118,7 +118,7 @@
if (arch_file_data->file)
{
- axis2_file_free(arch_file_data->file, env);
+ axutil_file_free(arch_file_data->file, env);
}
if (arch_file_data->msg_recv)
{
@@ -196,7 +196,7 @@
axis2_arch_file_data_get_name(const axis2_arch_file_data_t *arch_file_data,
const axutil_env_t *env)
{
- return axis2_file_get_name(arch_file_data->file, env);
+ return axutil_file_get_name(arch_file_data->file, env);
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
@@ -209,7 +209,7 @@
if (arch_file_data->file)
{
- svc_name = axis2_file_get_name(arch_file_data->file, env);
+ svc_name = axutil_file_get_name(arch_file_data->file, env);
}
else
{
@@ -226,7 +226,7 @@
return arch_file_data->type;
}
-AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+AXIS2_EXTERN axutil_file_t *AXIS2_CALL
axis2_arch_file_data_get_file(const axis2_arch_file_data_t *arch_file_data,
const axutil_env_t *env)
{
@@ -243,7 +243,7 @@
if (arch_file_data->file)
{
- module_name = axis2_file_get_name(arch_file_data->file, env);
+ module_name = axutil_file_get_name(arch_file_data->file, env);
}
else
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Mar 30 11:13:56 2007
@@ -271,21 +271,21 @@
return status;
}
-AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+AXIS2_EXTERN axutil_file_t *AXIS2_CALL
axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
const axutil_env_t *env,
axis2_char_t *module_name)
{
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
AXIS2_ENV_CHECK(env, NULL);
- file = axis2_file_create(env);
+ file = axutil_file_create(env);
if (!file)
{
return NULL;
}
- axis2_file_set_name(file, env, module_name);
+ axutil_file_set_name(file, env, module_name);
return file;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h Fri Mar 30 11:13:56 2007
@@ -32,7 +32,7 @@
#include <axis2_conf.h>
#include <axutil_array_list.h>
#include <axutil_dir_handler.h>
-#include <axis2_file.h>
+#include <axutil_file.h>
#ifdef __cplusplus
extern "C"
@@ -104,7 +104,7 @@
* @param file_data pointer to arch_file_data
* @param env pointer to environment struct
*/
- AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_file_t *AXIS2_CALL
axis2_arch_file_data_get_file(const axis2_arch_file_data_t *file_data,
const axutil_env_t *env);
@@ -209,7 +209,7 @@
AXIS2_EXTERN axis2_arch_file_data_t *AXIS2_CALL
axis2_arch_file_data_create_with_type_and_file(const axutil_env_t *env,
int type,
- axis2_file_t *file);
+ axutil_file_t *file);
/**
* Creates arch file data struct
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Fri Mar 30 11:13:56 2007
@@ -121,7 +121,7 @@
* @param env pointer to environment struct
* @param module_name pointer to module name
*/
- AXIS2_EXTERN axis2_file_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_file_t *AXIS2_CALL
axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
const axutil_env_t *env,
axis2_char_t *module_name);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Fri Mar 30 11:13:56 2007
@@ -228,7 +228,7 @@
AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
axis2_dep_engine_build_module(axis2_dep_engine_t *dep_engine,
const axutil_env_t *env,
- axis2_file_t *module_archive,
+ axutil_file_t *module_archive,
struct axis2_conf *conf);
/**
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Fri Mar 30 11:13:56 2007
@@ -93,7 +93,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *info_list,
const axutil_env_t *env,
- axis2_file_t *file,
+ axutil_file_t *file,
int type);
/**
@@ -119,7 +119,7 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_modified(axis2_ws_info_list_t *info_list,
const axutil_env_t *env,
- axis2_file_t *file,
+ axutil_file_t *file,
struct axis2_ws_info *ws_info);
/**
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=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 11:13:56 2007
@@ -894,7 +894,7 @@
for (i = 0; i < sizei; i++)
{
axis2_svc_t *svc = NULL;
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
axutil_array_list_t *grp_modules = NULL;
axutil_array_list_t *list = NULL;
int sizej = 0;
@@ -907,7 +907,7 @@
/*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
file = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
- file_name = axis2_file_get_name(file, env);
+ file_name = axutil_file_get_name(file, env);
axis2_svc_set_file_name(svc, env, file_name);
/* modules from svc group */
@@ -1025,7 +1025,7 @@
axis2_module_t *module = NULL;
axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
- axis2_file_t *module_folder = NULL;
+ axutil_file_t *module_folder = NULL;
AXIS2_TIME_T timestamp = 0;
axis2_char_t *module_folder_path = NULL;
axis2_char_t *temp_path = NULL;
@@ -1043,9 +1043,9 @@
read_in_dll);
module_folder = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
- timestamp = axis2_file_get_timestamp(module_folder, env);
+ timestamp = axutil_file_get_timestamp(module_folder, env);
axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
- module_folder_path = axis2_file_get_path(module_folder, env);
+ module_folder_path = axutil_file_get_path(module_folder, env);
temp_path = axis2_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
dll_path = axis2_stracat(env, temp_path, dll_name);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -1428,7 +1428,7 @@
AXIS2_EXTERN axis2_module_desc_t *AXIS2_CALL
axis2_dep_engine_build_module(axis2_dep_engine_t *dep_engine,
const axutil_env_t *env,
- axis2_file_t *module_archive,
+ axutil_file_t *module_archive,
axis2_conf_t *conf)
{
axis2_module_desc_t *module_desc = NULL;
@@ -1452,7 +1452,7 @@
AXIS2_MODULE, module_archive);
module_desc = axis2_module_desc_create(env);
arch_reader = axis2_arch_reader_create(env);
- file_name = axis2_file_get_name(module_archive, env);
+ file_name = axutil_file_get_name(module_archive, env);
status = axis2_arch_reader_read_module_arch(arch_reader, env, file_name,
dep_engine, module_desc);
axis2_arch_reader_free(arch_reader, env);
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=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Fri Mar 30 11:13:56 2007
@@ -243,7 +243,7 @@
size = axutil_array_list_size(current_info_list, env);
for (i = 0; i < size; i++) /* loop until empty */
{
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
file = axutil_array_list_get(current_info_list, env, i);
status = axis2_ws_info_list_add_ws_info_item(repos_listener->info_list, env,
file, type);
@@ -255,10 +255,10 @@
size_j = axutil_array_list_size(current_info_list, env);
for (j = 0; j < size_j; j++)
{
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
del_file = axutil_array_list_get(current_info_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(current_info_list, env);
current_info_list = NULL;
@@ -268,10 +268,10 @@
for (i = 0; i < size; i++)
{
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
del_file = axutil_array_list_get(current_info_list, env, i);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(current_info_list, env);
current_info_list = NULL;
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=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 30 11:13:56 2007
@@ -169,7 +169,7 @@
axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_arch_file_data_t *arch_file_data = NULL;
- axis2_file_t *svc_folder = NULL;
+ axutil_file_t *svc_folder = NULL;
axis2_char_t *dll_path = NULL;
axis2_char_t *svc_folder_path = NULL;
int i = 0;
@@ -257,9 +257,9 @@
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env);
svc_folder = axis2_arch_file_data_get_file(arch_file_data, env);
- timestamp = axis2_file_get_timestamp(svc_folder, env);
+ timestamp = axutil_file_get_timestamp(svc_folder, env);
axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
- svc_folder_path = axis2_file_get_path(svc_folder, env);
+ svc_folder_path = axutil_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);
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Fri Mar 30 11:13:56 2007
@@ -157,7 +157,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_ws_info_list_add_ws_info_item(axis2_ws_info_list_t *ws_info_list,
const axutil_env_t *env,
- axis2_file_t *file,
+ axutil_file_t *file,
int type)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -167,7 +167,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
- temp_name = axis2_file_get_name(file, env);
+ temp_name = axutil_file_get_name(file, env);
info_list_name = axis2_strdup(env, temp_name);
if (!info_list_name)
{
@@ -186,7 +186,7 @@
long last_modified_date = 0;
axis2_arch_file_data_t *file_data = NULL;
- last_modified_date = axis2_file_get_timestamp(file, env);
+ last_modified_date = axutil_file_get_timestamp(file, env);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_SVC);
status = axutil_array_list_add(ws_info_list->ws_info_list, env, ws_info);
@@ -219,7 +219,7 @@
long last_modified_date = 0;
axis2_arch_file_data_t *file_data = NULL;
- last_modified_date = axis2_file_get_timestamp(file, env);
+ last_modified_date = axutil_file_get_timestamp(file, env);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_MODULE);
status = axutil_array_list_add(ws_info_list->ws_info_list, env, ws_info);
@@ -278,7 +278,7 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_ws_info_list_is_modified(axis2_ws_info_list_t *ws_info_list,
const axutil_env_t *env,
- axis2_file_t *file,
+ axutil_file_t *file,
axis2_ws_info_t *ws_info)
{
long last_modified_date = 0;
@@ -288,7 +288,7 @@
AXIS2_PARAM_CHECK(env->error, ws_info, AXIS2_FAILURE);
last_modified_date = axis2_ws_info_get_last_modified_date(ws_info, env);
- return (last_modified_date != axis2_file_get_timestamp(file, env));
+ return (last_modified_date != axutil_file_get_timestamp(file, env));
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Mar 30 11:13:56 2007
@@ -1296,7 +1296,7 @@
module_desc = axis2_conf_get_module(conf, env, module_ref);
if (! module_desc)
{
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
axis2_char_t *file_name = NULL;
axis2_arch_reader_t *arch_reader = NULL;
const axis2_char_t *repos_path = NULL;
@@ -1312,7 +1312,7 @@
return AXIS2_FAILURE;
}
file_name = axis2_qname_get_localpart(module_ref, env);
- file = (axis2_file_t *) axis2_arch_reader_create_module_arch(
+ file = (axutil_file_t *) axis2_arch_reader_create_module_arch(
arch_reader, env, file_name) ;
repos_path = axis2_conf_get_repo(conf, env);
temp_path1 = axis2_stracat(env, repos_path, AXIS2_PATH_SEP_STR);
@@ -1322,7 +1322,7 @@
AXIS2_FREE(env->allocator, temp_path1);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
- axis2_file_set_path(file, env, path);
+ axutil_file_set_path(file, env, path);
file_data = axis2_arch_file_data_create_with_type_and_file(env,
AXIS2_MODULE, file);
Copied: webservices/axis2/trunk/c/util/include/axutil_file.h (from r524208, webservices/axis2/trunk/c/util/include/axis2_file.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_file.h?view=diff&rev=524214&p1=webservices/axis2/trunk/c/util/include/axis2_file.h&r1=524208&p2=webservices/axis2/trunk/c/util/include/axutil_file.h&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_file.h Fri Mar 30 11:13:56 2007
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef AXIS2_FILE_H
-#define AXIS2_FILE_H
+#ifndef AXUTIL_FILE_H
+#define AXUTIL_FILE_H
#include <axis2_utils_defines.h>
#include <axutil_error.h>
@@ -30,10 +30,10 @@
{
#endif
- typedef struct axis2_file axis2_file_t;
+ typedef struct axutil_file axutil_file_t;
/**
- * @defgroup axis2_file file
+ * @defgroup axutil_file file
* @ingroup axis2_util
* @{
*/
@@ -42,45 +42,45 @@
* create new file
* @return file newly created file
*/
- AXIS2_EXTERN axis2_file_t * AXIS2_CALL
- axis2_file_create(const axutil_env_t *env);
+ AXIS2_EXTERN axutil_file_t * AXIS2_CALL
+ axutil_file_create(const axutil_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
- axis2_file_free(axis2_file_t *file,
+ axutil_file_free(axutil_file_t *file,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_file_set_name(axis2_file_t *file,
+ axutil_file_set_name(axutil_file_t *file,
const axutil_env_t *env,
axis2_char_t *name);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
- axis2_file_get_name(axis2_file_t *file,
+ axutil_file_get_name(axutil_file_t *file,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_file_set_path(axis2_file_t *file,
+ axutil_file_set_path(axutil_file_t *file,
const axutil_env_t *env,
axis2_char_t *path);
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
- axis2_file_get_path(axis2_file_t *file,
+ axutil_file_get_path(axutil_file_t *file,
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_file_set_timestamp(axis2_file_t *file,
+ axutil_file_set_timestamp(axutil_file_t *file,
const axutil_env_t *env,
AXIS2_TIME_T timestamp);
AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
- axis2_file_get_timestamp(axis2_file_t *file,
+ axutil_file_get_timestamp(axutil_file_t *file,
const axutil_env_t *env);
/**
* create a newly allocated clone of the argument file
*/
- AXIS2_EXTERN axis2_file_t * AXIS2_CALL
- axis2_file_clone(axis2_file_t *file,
+ AXIS2_EXTERN axutil_file_t * AXIS2_CALL
+ axutil_file_clone(axutil_file_t *file,
const axutil_env_t *env);
#ifdef __cplusplus
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=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Fri Mar 30 11:13:56 2007
@@ -16,7 +16,7 @@
*/
#include <axutil_dir_handler.h>
-#include <axis2_file.h>
+#include <axutil_file.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <axis2_string.h>
#ifndef S_ISDIR
@@ -61,29 +61,29 @@
for (i = 1; i < (count + 1) ; ++i)
{
axis2_char_t *fname = NULL;
- axis2_file_t *arch_file = NULL;
+ axutil_file_t *arch_file = NULL;
axis2_char_t *path = NULL;
axis2_char_t *temp_path = NULL;
fname = files[i-1]->d_name;
- arch_file = (axis2_file_t *) axis2_file_create(env);
+ arch_file = (axutil_file_t *) axutil_file_create(env);
if (!arch_file)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_file_set_name(arch_file, env, fname);
+ axutil_file_set_name(arch_file, env, fname);
temp_path = axis2_stracat(env, pathname, AXIS2_PATH_SEP_STR);
path = axis2_stracat(env, temp_path, fname);
AXIS2_FREE(env->allocator, temp_path);
@@ -91,56 +91,56 @@
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_file_set_path(arch_file, env, path);
+ axutil_file_set_path(arch_file, env, path);
buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if (!buf)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
AXIS2_FREE(env->allocator, path);
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
- axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
+ axutil_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
status = axutil_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
AXIS2_FREE(env->allocator, buf);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
return NULL;
@@ -196,86 +196,86 @@
for (i = 1; i < (count + 1) ; ++i)
{
axis2_char_t *fname = NULL;
- axis2_file_t *arch_file = NULL;
+ axutil_file_t *arch_file = NULL;
axis2_char_t *path = NULL;
axis2_char_t *temp_path = NULL;
fname = files[i-1]->d_name;
- arch_file = (axis2_file_t *) axis2_file_create(env);
+ arch_file = (axutil_file_t *) axutil_file_create(env);
if (!arch_file)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_file_set_name(arch_file, env, fname);
+ axutil_file_set_name(arch_file, env, fname);
temp_path = axis2_stracat(env, pathname, AXIS2_PATH_SEP_STR);
path = axis2_stracat(env, temp_path, fname);
if (!path)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- axis2_file_set_path(arch_file, env, path);
+ axutil_file_set_path(arch_file, env, path);
AXIS2_FREE(env->allocator, temp_path);
buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if (!buf)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
stat(path, buf);
- axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
+ axutil_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
status = axutil_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
int size = 0;
int j = 0;
- axis2_file_t *del_file = NULL;
+ axutil_file_t *del_file = NULL;
- axis2_file_free(arch_file, env);
+ axutil_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
AXIS2_FREE(env->allocator, buf);
size = axutil_array_list_size(file_list, env);
for (j = 0; j < size; j++)
{
del_file = axutil_array_list_get(file_list, env, j);
- axis2_file_free(del_file, env);
+ axutil_file_free(del_file, env);
}
axutil_array_list_free(file_list, env);
return NULL;
Modified: webservices/axis2/trunk/c/util/src/file.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/file.c?view=diff&rev=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Fri Mar 30 11:13:56 2007
@@ -15,25 +15,25 @@
* limitations under the License.
*/
-#include <axis2_file.h>
+#include <axutil_file.h>
#include <axis2_string.h>
-struct axis2_file
+struct axutil_file
{
axis2_char_t *name;
axis2_char_t *path;
AXIS2_TIME_T timestamp;
};
-AXIS2_EXTERN axis2_file_t *AXIS2_CALL
-axis2_file_create(const axutil_env_t *env)
+AXIS2_EXTERN axutil_file_t *AXIS2_CALL
+axutil_file_create(const axutil_env_t *env)
{
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
AXIS2_ENV_CHECK(env, NULL);
- file = (axis2_file_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_file_t));
+ file = (axutil_file_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axutil_file_t));
if (! file)
{
@@ -48,7 +48,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_file_free(axis2_file_t *file,
+axutil_file_free(axutil_file_t *file,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -71,7 +71,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_file_set_name(axis2_file_t *file,
+axutil_file_set_name(axutil_file_t *file,
const axutil_env_t *env,
axis2_char_t *name)
{
@@ -93,7 +93,7 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_file_get_name(axis2_file_t *file,
+axutil_file_get_name(axutil_file_t *file,
const axutil_env_t *env)
{
if (!file->name)
@@ -106,7 +106,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_file_set_path(axis2_file_t *file,
+axutil_file_set_path(axutil_file_t *file,
const axutil_env_t *env,
axis2_char_t *path)
{
@@ -131,7 +131,7 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_file_get_path(axis2_file_t *file,
+axutil_file_get_path(axutil_file_t *file,
const axutil_env_t *env)
{
if (!(file->path))
@@ -145,7 +145,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_file_set_timestamp(axis2_file_t *file,
+axutil_file_set_timestamp(axutil_file_t *file,
const axutil_env_t *env,
AXIS2_TIME_T timestamp)
{
@@ -154,31 +154,31 @@
}
AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
-axis2_file_get_timestamp(axis2_file_t *file,
+axutil_file_get_timestamp(axutil_file_t *file,
const axutil_env_t *env)
{
return file->timestamp;
}
-AXIS2_EXTERN axis2_file_t *AXIS2_CALL
-axis2_file_clone(axis2_file_t *file,
+AXIS2_EXTERN axutil_file_t *AXIS2_CALL
+axutil_file_clone(axutil_file_t *file,
const axutil_env_t *env)
{
- axis2_file_t *new_file = NULL;
+ axutil_file_t *new_file = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- new_file = axis2_file_create(env);
- status = axis2_file_set_name(new_file, env, file->name);
+ new_file = axutil_file_create(env);
+ status = axutil_file_set_name(new_file, env, file->name);
if (AXIS2_SUCCESS != status)
{
return NULL;
}
- status = axis2_file_set_path(new_file, env, file->path);
+ status = axutil_file_set_path(new_file, env, file->path);
if (AXIS2_SUCCESS != status)
{
return NULL;
}
- axis2_file_set_timestamp(new_file, env, file->timestamp);
+ axutil_file_set_timestamp(new_file, env, file->timestamp);
return new_file;
}
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=524214&r1=524213&r2=524214
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Fri Mar 30 11:13:56 2007
@@ -25,7 +25,7 @@
#include <axis2_log_default.h>
#include <axis2_log.h>
#include <axutil_dir_handler.h>
-#include <axis2_file.h>
+#include <axutil_file.h>
#include "axis2_log.h"
#include "test_thread.h"
#include <test_log.h>
@@ -110,7 +110,7 @@
void test_axutil_dir_handler_list_service_or_module_dirs()
{
int i, isize;
- axis2_file_t *file = NULL;
+ axutil_file_t *file = NULL;
axis2_char_t *filename = NULL;
axutil_allocator_t *allocator = axutil_allocator_init(NULL);
axutil_error_t *error = axutil_error_create(allocator);
@@ -131,8 +131,8 @@
for (i = 0;i < isize;++i)
{
- file = (axis2_file_t*)axutil_array_list_get(arr_folders, env, i);
- filename = axis2_file_get_name(file, env);
+ file = (axutil_file_t*)axutil_array_list_get(arr_folders, env, i);
+ filename = axutil_file_get_name(file, env);
printf("filename = %s \n", filename);
}
printf("----end of test_axutil_dir_handler_list_service_or_module_dirs----\n");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org