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 12:15:06 UTC
svn commit: r516011 - in /webservices/axis2/trunk/c: axiom/test/soap/
modules/core/deployment/ modules/core/engine/
rampart/samples/client/sec_echo/ savan/samples/client/subscriber/
savan/src/client/ test/itest/whitemesa/round1/ test/itest/whitemesa/ro...
Author: dinesh
Date: Thu Mar 8 03:15:03 2007
New Revision: 516011
URL: http://svn.apache.org/viewvc?view=rev&rev=516011
Log:
macro's removed file.c
Modified:
webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
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/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/rampart/samples/client/sec_echo/echo.c
webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
webservices/axis2/trunk/c/savan/src/client/savan_client.c
webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
webservices/axis2/trunk/c/util/include/axis2_file.h
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
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Thu Mar 8 03:15:03 2007
@@ -133,7 +133,7 @@
xml_reader = axiom_xml_reader_create_for_io(env, read_soap, close_soap , NULL, NULL);
if (!xml_reader)
{
- printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
@@ -142,21 +142,21 @@
if (!om_builder)
{
AXIOM_XML_READER_FREE(xml_reader, env);
- printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
soap_builder = axiom_soap_builder_create(env, om_builder, uri);
if (!soap_builder)
{
- printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
soap_envelope = AXIOM_SOAP_BUILDER_GET_SOAP_ENVELOPE(soap_builder, env);
if (!soap_envelope)
{
AXIOM_SOAP_BUILDER_FREE(soap_builder, env);
- printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("%s \n", axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
@@ -196,7 +196,7 @@
}
else
{
- printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("%s \n", axis2_error_get_message(env->error));
printf("\n\n ERROR soap_body NULL.\n\n");
return AXIS2_FAILURE;
}
@@ -215,7 +215,7 @@
status = AXIOM_SOAP_BUILDER_NEXT(soap_builder, env);
if (status == AXIS2_FAILURE)
{
- printf("failure %s" , AXIS2_ERROR_GET_MESSAGE(env->error));
+ printf("failure %s" , axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
}
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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Thu Mar 8 03:15:03 2007
@@ -232,7 +232,7 @@
return NULL;
}
file_data_impl->type = type;
- file_data_impl->file = AXIS2_FILE_CLONE(file, env);
+ file_data_impl->file = axis2_file_clone(file, env);
return &(file_data_impl->arch_file_data);
}
@@ -269,7 +269,7 @@
if (file_data_impl->file)
{
- AXIS2_FILE_FREE(file_data_impl->file, env);
+ axis2_file_free(file_data_impl->file, env);
file_data_impl->file = NULL;
}
if (file_data_impl->msg_recv)
@@ -374,7 +374,7 @@
AXIS2_ENV_CHECK(env, NULL);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
- return AXIS2_FILE_GET_NAME(file_data_impl->file, env);
+ return axis2_file_get_name(file_data_impl->file, env);
}
axis2_char_t *AXIS2_CALL
@@ -390,7 +390,7 @@
if (file_data_impl->file)
{
- svc_name = AXIS2_FILE_GET_NAME(file_data_impl->file, env);
+ svc_name = axis2_file_get_name(file_data_impl->file, env);
}
else
{
@@ -431,7 +431,7 @@
if (file_data_impl->file)
{
- module_name = AXIS2_FILE_GET_NAME(file_data_impl->file, env);
+ module_name = axis2_file_get_name(file_data_impl->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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Thu Mar 8 03:15:03 2007
@@ -508,6 +508,6 @@
{
return NULL;
}
- AXIS2_FILE_SET_NAME(file, env, module_name);
+ axis2_file_set_name(file, env, module_name);
return file;
}
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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Mar 8 03:15:03 2007
@@ -1099,7 +1099,7 @@
/*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
file = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine_impl->curr_file, env);
- file_name = AXIS2_FILE_GET_NAME(file, env);
+ file_name = axis2_file_get_name(file, env);
AXIS2_SVC_SET_FILE_NAME(svc, env, file_name);
/* modules from svc group */
@@ -1277,9 +1277,9 @@
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);
+ timestamp = axis2_file_get_timestamp(module_folder, env);
axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
- module_folder_path = AXIS2_FILE_GET_PATH(module_folder, env);
+ 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,
@@ -1742,7 +1742,7 @@
env, 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 = axis2_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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Thu Mar 8 03:15:03 2007
@@ -377,7 +377,7 @@
axis2_file_t *del_file = NULL;
del_file = axis2_array_list_get(current_info_list, env, j);
- AXIS2_FILE_FREE(del_file, env);
+ axis2_file_free(del_file, env);
}
axis2_array_list_free(current_info_list, env);
current_info_list = NULL;
@@ -390,7 +390,7 @@
axis2_file_t *del_file = NULL;
del_file = axis2_array_list_get(current_info_list, env, i);
- AXIS2_FILE_FREE(del_file, env);
+ axis2_file_free(del_file, env);
}
axis2_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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Thu Mar 8 03:15:03 2007
@@ -339,9 +339,9 @@
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);
+ timestamp = axis2_file_get_timestamp(svc_folder, env);
axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
- svc_folder_path = AXIS2_FILE_GET_PATH(svc_folder, env);
+ 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);
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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Thu Mar 8 03:15:03 2007
@@ -266,7 +266,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 = axis2_file_get_name(file, env);
info_list_name = AXIS2_STRDUP(temp_name, env);
if (!info_list_name)
{
@@ -286,7 +286,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 = axis2_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);
@@ -319,7 +319,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 = axis2_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);
@@ -391,7 +391,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 != axis2_file_get_timestamp(file, env));
}
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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Thu Mar 8 03:15:03 2007
@@ -1888,7 +1888,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);
+ axis2_file_set_path(file, env, path);
file_data = axis2_arch_file_data_create_with_type_and_file(env,
AXIS2_MODULE, file);
Modified: webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c Thu Mar 8 03:15:03 2007
@@ -101,7 +101,7 @@
printf("Error creating service client\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
}
/* Set service client options */
@@ -126,7 +126,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("echo client invoke FAILED!\n");
}
Modified: webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c (original)
+++ webservices/axis2/trunk/c/savan/samples/client/subscriber/subscriber.c Thu Mar 8 03:15:03 2007
@@ -176,7 +176,7 @@
printf("Error creating service client\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Client invoke failed: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
}
/* Set service client options */
@@ -201,7 +201,7 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
- " %d :: %s", env->error->error_number, AXIS2_ERROR_GET_MESSAGE(env->error));
+ " %d :: %s", env->error->error_number, axis2_error_get_message(env->error));
printf("\nPublisher init failed\n");
}
}
Modified: webservices/axis2/trunk/c/savan/src/client/savan_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/client/savan_client.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/savan/src/client/savan_client.c (original)
+++ webservices/axis2/trunk/c/savan/src/client/savan_client.c Thu Mar 8 03:15:03 2007
@@ -148,7 +148,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to send subscription "
"request. Error: %d Reason: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return AXIS2_FAILURE;
}
@@ -225,7 +225,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to send renew "
"request. Error: %d Reason: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("Failed to send renew request\n");
return AXIS2_FAILURE;
}
@@ -272,7 +272,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to send unsubscribe "
"request. Error: %d Reason: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("Failed to send unsubscribe request\n");
return AXIS2_FAILURE;
}
@@ -327,7 +327,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to send get status "
"request. Error: %d Reason: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("Failed to send get status request\n");
return NULL;
}
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c Thu Mar 8 03:15:03 2007
@@ -98,7 +98,7 @@
printf("Error creating service client\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
}
/* Set service client options */
@@ -158,7 +158,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Stub invoke FAILED: Error code:" " %d :: %s",
env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("round1 stub invoke FAILED!\n");
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c Thu Mar 8 03:15:03 2007
@@ -98,7 +98,7 @@
printf("Error creating service client\n");
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
}
/* Set service client options */
@@ -158,7 +158,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Stub invoke FAILED: Error code:" " %d :: %s",
env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
printf("round1 stub invoke FAILED!\n");
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c Thu Mar 8 03:15:03 2007
@@ -158,7 +158,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -213,7 +213,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -262,7 +262,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -317,7 +317,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -366,7 +366,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -421,7 +421,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -470,7 +470,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -525,7 +525,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c Thu Mar 8 03:15:03 2007
@@ -278,7 +278,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -333,7 +333,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -382,7 +382,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -437,7 +437,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -486,7 +486,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -541,7 +541,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -590,7 +590,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -645,7 +645,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -694,7 +694,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -749,7 +749,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -798,7 +798,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -853,7 +853,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -902,7 +902,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -957,7 +957,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1006,7 +1006,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1061,7 +1061,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1110,7 +1110,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1165,7 +1165,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1214,7 +1214,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1269,7 +1269,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1318,7 +1318,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1373,7 +1373,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1422,7 +1422,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1477,7 +1477,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1526,7 +1526,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1581,7 +1581,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1630,7 +1630,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return NULL;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
@@ -1685,7 +1685,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "options is null in stub: Error code:"
" %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ axis2_error_get_message(env->error));
return;
}
svc_client = AXIS2_STUB_GET_SVC_CLIENT(stub, env);
Modified: webservices/axis2/trunk/c/util/include/axis2_file.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_file.h?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_file.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_file.h Thu Mar 8 03:15:03 2007
@@ -83,32 +83,6 @@
axis2_file_clone(axis2_file_t *file,
const axis2_env_t *env);
-#define AXIS2_FILE_FREE(file, env) \
- axis2_file_free (file, env)
-
-#define AXIS2_FILE_GET_NAME(file, env) \
- axis2_file_get_name (file, env)
-
-#define AXIS2_FILE_SET_NAME(file, env, name) \
- axis2_file_set_name (file, env, name)
-
-#define AXIS2_FILE_GET_PATH(file, env) \
- axis2_file_get_path (file, env)
-
-#define AXIS2_FILE_SET_PATH(file, env, path) \
- axis2_file_set_path (file, env, path)
-
-#define AXIS2_FILE_GET_TIMESTAMP(file, env) \
- axis2_file_get_timestamp (file, env)
-
-#define AXIS2_FILE_SET_TIMESTAMP(file, env, timestamp) \
- axis2_file_set_timestamp (file, env, timestamp)
-
-#define AXIS2_FILE_CLONE(file, env) \
- axis2_file_clone (file, env)
-
- /** @} */
-
#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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Thu Mar 8 03:15:03 2007
@@ -77,13 +77,13 @@
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
- AXIS2_FILE_FREE(del_file, env);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ axis2_file_set_name(arch_file, env, fname);
temp_path = AXIS2_STRACAT(pathname, AXIS2_PATH_SEP_STR, env);
path = AXIS2_STRACAT(temp_path, fname, env);
AXIS2_FREE(env->allocator, temp_path);
@@ -93,18 +93,18 @@
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
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);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ axis2_file_set_path(arch_file, env, path);
buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if (!buf)
{
@@ -113,19 +113,19 @@
axis2_file_t *del_file = NULL;
AXIS2_FREE(env->allocator, path);
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
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);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
status = axis2_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
@@ -133,14 +133,14 @@
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
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);
+ axis2_file_free(del_file, env);
}
axis2_array_list_free(file_list, env);
return NULL;
@@ -212,13 +212,13 @@
for (j = 0; j < size; j++)
{
del_file = axis2_array_list_get(file_list, env, j);
- AXIS2_FILE_FREE(del_file, env);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ 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)
@@ -227,18 +227,18 @@
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
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);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ axis2_file_set_path(arch_file, env, path);
AXIS2_FREE(env->allocator, temp_path);
buf = AXIS2_MALLOC(env->allocator, sizeof(struct stat));
if (!buf)
@@ -247,20 +247,20 @@
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
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);
+ axis2_file_free(del_file, env);
}
axis2_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);
+ axis2_file_set_timestamp(arch_file, env, (time_t) buf->st_ctime);
status = axis2_array_list_add(file_list, env, arch_file);
if (AXIS2_SUCCESS != status)
{
@@ -268,14 +268,14 @@
int j = 0;
axis2_file_t *del_file = NULL;
- AXIS2_FILE_FREE(arch_file, env);
+ axis2_file_free(arch_file, env);
AXIS2_FREE(env->allocator, path);
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);
+ axis2_file_free(del_file, env);
}
axis2_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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/util/src/file.c (original)
+++ webservices/axis2/trunk/c/util/src/file.c Thu Mar 8 03:15:03 2007
@@ -56,19 +56,16 @@
if (file->name)
{
AXIS2_FREE(env->allocator, file->name);
- file->name = NULL;
}
if (file->path)
{
AXIS2_FREE(env->allocator, file->path);
- file->path = NULL;
}
if (file)
{
AXIS2_FREE(env->allocator, file);
- file = NULL;
}
return AXIS2_SUCCESS;
}
@@ -84,7 +81,6 @@
if (file->name)
{
AXIS2_FREE(env->allocator, file->name);
- file->name = NULL;
}
file->name = AXIS2_STRDUP(name, env);
if (!file->name)
@@ -99,15 +95,12 @@
axis2_file_get_name(axis2_file_t *file,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
if (!file->name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
AXIS2_FAILURE);
return NULL;
}
-
return (file->name);
}
@@ -126,7 +119,6 @@
if (file->path)
{
AXIS2_FREE(env->allocator, file->path);
- file->path = NULL;
}
file->path = AXIS2_STRDUP(path, env);
if (!(file->path))
@@ -141,8 +133,6 @@
axis2_file_get_path(axis2_file_t *file,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
if (!(file->path))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_FILE_NAME_NOT_SET,
@@ -159,9 +149,7 @@
AXIS2_TIME_T timestamp)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
file->timestamp = timestamp;
-
return AXIS2_SUCCESS;
}
@@ -169,7 +157,6 @@
axis2_file_get_timestamp(axis2_file_t *file,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return file->timestamp;
}
@@ -179,21 +166,19 @@
{
axis2_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);
+ status = axis2_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 = axis2_file_set_path(new_file, env, file->path);
if (AXIS2_SUCCESS != status)
{
return NULL;
}
- AXIS2_FILE_SET_TIMESTAMP(new_file, env, file->timestamp);
+ axis2_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=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_util.c Thu Mar 8 03:15:03 2007
@@ -132,7 +132,7 @@
for (i = 0;i < isize;++i)
{
file = (axis2_file_t*)axis2_array_list_get(arr_folders, env, i);
- filename = AXIS2_FILE_GET_NAME(file, env);
+ filename = axis2_file_get_name(file, env);
printf("filename = %s \n", filename);
}
printf("----end of test_axis2_dir_handler_list_service_or_module_dirs----\n");
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Thu Mar 8 03:15:03 2007
@@ -1155,7 +1155,7 @@
*/
schema_def = XML_SCHEMA_COLLECTION_READ_ELEMENT_WITH_URI(xsc,
env, schema_el_node, base_uri_str);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
return NULL;
}
@@ -1263,7 +1263,7 @@
uri = WODEN_IMPORTED_SCHEMA_GET_LOCATION(schema, env);
schema_loc = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
uri = axis2_uri_parse_relative(env, context_uri, schema_loc);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
/* can't continue schema retrieval with a bad URL.*/
WODEN_SCHEMA_SET_REFERENCEABLE(schema, env, AXIS2_FALSE);
@@ -1292,7 +1292,7 @@
imported_schema_doc = axiom_document_create(env, NULL, xml_builder);
schema_def = XML_SCHEMA_COLLECTION_READ_DOCUMENT(schema_col,
env, imported_schema_doc);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
WODEN_SCHEMA_SET_REFERENCEABLE(schema, env, AXIS2_FALSE);
return schema;
@@ -3817,7 +3817,7 @@
{
/* If no error condition occured then this will return
*/
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
return AXIS2_FAILURE;
else
return AXIS2_SUCCESS;
@@ -3983,7 +3983,7 @@
desc = woden_desc_to_desc_element(desc, env);
context_uri = WODEN_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
location_uri = axis2_uri_parse_relative(env, context_uri, location_uri_str);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
/* Can't continue import with a bad URL.*/
return NULL;
@@ -4007,7 +4007,7 @@
builder = axiom_stax_builder_create(env, xml_reader);
doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
doc_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
/* Cannot contine without the referenced document */
return NULL;
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Thu Mar 8 03:15:03 2007
@@ -1181,7 +1181,7 @@
*/
schema_def = XML_SCHEMA_COLLECTION_READ_ELEMENT_WITH_URI(xsc,
env, schema_el_node, base_uri_str);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
return NULL;
}
@@ -1291,7 +1291,7 @@
uri = WODEN_IMPORTED_SCHEMA_GET_LOCATION(schema, env);
schema_loc = AXIS2_URI_TO_STRING(uri, env, AXIS2_URI_UNP_OMITUSERINFO);
uri = axis2_uri_parse_relative(env, context_uri, schema_loc);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
void *base_schema = NULL;
@@ -1323,7 +1323,7 @@
imported_schema_doc = axiom_document_create(env, NULL, xml_builder);
schema_def = XML_SCHEMA_COLLECTION_READ_DOCUMENT(schema_col,
env, imported_schema_doc);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
void *base_schema = NULL;
@@ -3641,7 +3641,7 @@
{
/* If no error condition occured then this will return
*/
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
return AXIS2_FAILURE;
else
return AXIS2_SUCCESS;
@@ -3813,7 +3813,7 @@
desc = woden_wsdl10_desc_to_desc_element(desc, env);
context_uri = WODEN_WSDL10_DESC_ELEMENT_GET_DOCUMENT_BASE_URI(desc, env);
location_uri = axis2_uri_parse_relative(env, context_uri, location_uri_str);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
/* Can't continue import with a bad URL.*/
return NULL;
@@ -3837,7 +3837,7 @@
builder = axiom_stax_builder_create(env, xml_reader);
doc = AXIOM_STAX_BUILDER_GET_DOCUMENT(builder, env);
doc_el_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(doc, env);
- if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
+ if (AXIS2_SUCCESS != axis2_error_get_status_code(env->error))
{
/* Cannot contine without the referenced document */
return NULL;
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=516011&r1=516010&r2=516011
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Thu Mar 8 03:15:03 2007
@@ -794,7 +794,7 @@
index = axis2_array_list_index_of(types_impl->f_schemas, env, schema);
axis2_array_list_remove(types_impl->f_schemas, env, index);
- code = AXIS2_ERROR_GET_STATUS_CODE(env->error);
+ code = axis2_error_get_status_code(env->error);
return code;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org