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 du...@apache.org on 2007/03/19 10:12:54 UTC
svn commit: r519881 - in /webservices/axis2/trunk/c/modules/core:
deployment/arch_reader.c deployment/axis2_arch_reader.h
deployment/dep_engine.c engine/conf.c
Author: dushshantha
Date: Mon Mar 19 02:12:51 2007
New Revision: 519881
URL: http://svn.apache.org/viewvc?view=rev&rev=519881
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
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=519881&r1=519880&r2=519881
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Mon Mar 19 02:12:51 2007
@@ -25,22 +25,19 @@
struct axis2_arch_reader
{
axis2_desc_builder_t *desc_builder;
-
};
AXIS2_EXTERN axis2_arch_reader_t *AXIS2_CALL
-axis2_arch_reader_create(
- const axis2_env_t *env)
+axis2_arch_reader_create(const axis2_env_t *env)
{
axis2_arch_reader_t *arch_reader = NULL;
AXIS2_ENV_CHECK(env, NULL);
arch_reader = (axis2_arch_reader_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_arch_reader_t));
+ allocator, sizeof(axis2_arch_reader_t));
-
- if (NULL == arch_reader)
+ if (!arch_reader)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -52,8 +49,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_reader_free(
- axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_free(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -72,10 +68,9 @@
}
AXIS2_EXTERN struct axis2_svc *AXIS2_CALL
- axis2_arch_reader_create_svc(
- axis2_arch_reader_t *arch_reader,
- const axis2_env_t *env,
- struct axis2_arch_file_data *file)
+axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
+ const axis2_env_t *env,
+ struct axis2_arch_file_data *file)
{
axis2_svc_t *svc = NULL;
svc = axis2_svc_create(env);
@@ -83,8 +78,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_reader_process_svc_grp(
- axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_process_svc_grp(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
@@ -101,8 +95,8 @@
repos_path = AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env);
svcs_xml = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
- AXIS2_SERVICE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
- AXIS2_PATH_SEP_STR, AXIS2_SVC_XML, NULL);
+ AXIS2_SERVICE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
+ AXIS2_PATH_SEP_STR, AXIS2_SVC_XML, NULL);
if (!svcs_xml)
{
@@ -116,7 +110,7 @@
axis2_char_t *svc_name = NULL;
status = axis2_arch_reader_build_svc_grp(arch_reader, env, svcs_xml,
- dep_engine, svc_grp);
+ dep_engine, svc_grp);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -128,7 +122,7 @@
else
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
AXIS2_FREE(env->allocator, svcs_xml);
@@ -136,8 +130,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_reader_build_svc_grp(
- axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_build_svc_grp(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env,
axis2_char_t *svc_xml,
axis2_dep_engine_t *dep_engine,
@@ -160,14 +153,14 @@
}
arch_reader->desc_builder =
axis2_desc_builder_create_with_file_and_dep_engine(env, svc_xml,
- dep_engine);
+ dep_engine);
if (!arch_reader->desc_builder)
{
return AXIS2_FAILURE;
}
-
+
svcs = AXIS2_DESC_BUILDER_BUILD_OM(arch_reader->desc_builder, env);
-
+
if (svcs)
{
svcs_element = AXIOM_NODE_GET_DATA_ELEMENT(svcs, env);
@@ -176,7 +169,7 @@
root_element_name = axiom_element_get_localname(svcs_element, env);
}
}
-
+
if (root_element_name && 0 == axis2_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
{
axis2_svc_t *svc = NULL;
@@ -188,7 +181,7 @@
file_data = AXIS2_DEP_ENGINE_GET_CURRENT_FILE_ITEM(dep_engine, env);
svc_name = axis2_arch_file_data_get_name(file_data, env);
svc = axis2_arch_file_data_get_svc(file_data, env, svc_name);
- if (NULL == svc)
+ if (!svc)
{
axis2_qname_t *svc_qname = NULL;
@@ -205,7 +198,7 @@
AXIS2_SVC_SET_PARENT(svc, env, svc_grp);
svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
- dep_engine, svc);
+ dep_engine, svc);
status = AXIS2_SVC_BUILDER_POPULATE_SVC(svc_builder, env, svcs);
AXIS2_SVC_BUILDER_FREE(svc_builder, env);
if (AXIS2_SUCCESS != status)
@@ -227,11 +220,12 @@
}
}
- else if (root_element_name && 0 == axis2_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
+ else if (root_element_name &&
+ 0 == axis2_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
{
axis2_svc_grp_builder_t *grp_builder = NULL;
grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
- svcs, dep_engine);
+ svcs, dep_engine);
status = AXIS2_SVC_GRP_BUILDER_POPULATE_SVC_GRP(grp_builder, env, svc_grp);
AXIS2_SVC_GRP_BUILDER_FREE(grp_builder, env);
}
@@ -239,8 +233,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_arch_reader_read_module_arch(
- axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env,
axis2_char_t *file_name,
axis2_dep_engine_t *dep_engine,
@@ -257,8 +250,8 @@
repos_path = AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env);
module_xml = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR,
- AXIS2_MODULE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
- AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML, NULL);
+ AXIS2_MODULE_FOLDER, AXIS2_PATH_SEP_STR, file_name,
+ AXIS2_PATH_SEP_STR, AXIS2_MODULE_XML, NULL);
if (!module_xml)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -271,14 +264,14 @@
axis2_module_builder_t *module_builder = NULL;
module_builder =
axis2_module_builder_create_with_file_and_dep_engine_and_module(env,
- module_xml, dep_engine, module_desc);
+ module_xml, dep_engine, module_desc);
status = AXIS2_MODULE_BUILDER_POPULATE_MODULE(module_builder, env);
AXIS2_MODULE_BUILDER_FREE(module_builder, env);
}
else
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE, AXIS2_FAILURE);
+ AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
AXIS2_FREE(env->allocator, module_xml);
@@ -286,8 +279,7 @@
}
AXIS2_EXTERN axis2_file_t *AXIS2_CALL
-axis2_arch_reader_create_module_arch(
- axis2_arch_reader_t *arch_reader,
+axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env,
axis2_char_t *module_name)
{
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=519881&r1=519880&r2=519881
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Mon Mar 19 02:12:51 2007
@@ -23,11 +23,6 @@
* @{
*/
-/**
- * @file axis2_arch_reader.h
- * @brief Axis2 Arch Reader interface
- */
-
#include <axis2_const.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -65,7 +60,6 @@
axis2_arch_reader_free(axis2_arch_reader_t *arch_reader,
const axis2_env_t *env);
-
/**
* To create a ServiceDescrption <code>AxisService</code> using given wsdl.
* If the service.wsdl is there in the arcive file AxisService will be creted
@@ -141,29 +135,29 @@
axis2_arch_reader_create(const axis2_env_t *env);
-/** Frees the arch reader. */
+/** Frees the arch reader.
#define AXIS2_ARCH_READER_FREE(arch_reader, env) \
- axis2_arch_reader_free (arch_reader, env)
+ axis2_arch_reader_free (arch_reader, env)*/
-/** Creates the service. */
+/** Creates the service.
#define AXIS2_ARCH_READER_CREATE_SVC(arch_reader, env, file) \
- axis2_arch_reader_create_svc (arch_reader, env, file)
+ axis2_arch_reader_create_svc (arch_reader, env, file)*/
-/** Process service group. */
+/** Process service group.
#define AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env, file_path, dep_engine, svc_grp) \
- axis2_arch_reader_process_svc_grp (arch_reader, env, file_path, dep_engine, svc_grp)
+ axis2_arch_reader_process_svc_grp (arch_reader, env, file_path, dep_engine, svc_grp)*/
-/** Builds the service group. */
+/** Builds the service group.
#define AXIS2_ARCH_READER_BUILD_SVC_GRP(arch_reader, env, file_name, dep_engine, svc_grp) \
- axis2_arch_reader_build_svc_grp (arch_reader, env, file_name, dep_engine, svc_grp)
+ axis2_arch_reader_build_svc_grp (arch_reader, env, file_name, dep_engine, svc_grp)*/
-/** Reads the module archive.*/
+/** Reads the module archive.
#define AXIS2_ARCH_READER_READ_MODULE_ARCH(arch_reader, env, file_path, dep_engine, module) \
- axis2_arch_reader_read_module_arch (arch_reader, env, file_path, dep_engine, module)
+ axis2_arch_reader_read_module_arch (arch_reader, env, file_path, dep_engine, module)*/
-/** Creates the module archive. */
+/** Creates the module archive.
#define AXIS2_ARCH_READER_CREATE_MODULE_ARCH(arch_reader, env, module_name) \
- axis2_arch_reader_create_module_arch (arch_reader, env, module_name)
+ axis2_arch_reader_create_module_arch (arch_reader, env, module_name)*/
/** @} */
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=519881&r1=519880&r2=519881
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Mon Mar 19 02:12:51 2007
@@ -289,7 +289,7 @@
if (dep_engine->arch_reader)
{
- AXIS2_ARCH_READER_FREE(dep_engine->arch_reader, env);
+ axis2_arch_reader_free(dep_engine->arch_reader, env);
}
if (dep_engine->svc_builder)
@@ -1218,17 +1218,17 @@
* AXIS2_ARCH_READER_PROCESS_WSDLS(arch_reader, env, dep_engine->curr_file);
* absolute_path = AXIS2_ARCH_FILE_DATA_GET_ABSOLUTE_PATH(
* dep_engine->curr_file, env);
- * svc = AXIS2_ARCH_READER_CREATE_SVC(arch_reader, env, absolute_path);
+ * svc = axis2_arch_reader_create_svc(arch_reader, env, absolute_path);
*/
svc_grp = axis2_svc_grp_create_with_conf(env,
dep_engine->conf);
file_name = axis2_arch_file_data_get_name(dep_engine->
curr_file, env);
- status = AXIS2_ARCH_READER_PROCESS_SVC_GRP(arch_reader, env,
+ status = axis2_arch_reader_process_svc_grp(arch_reader, env,
file_name, dep_engine, svc_grp);
if (AXIS2_SUCCESS != status)
{
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SVC,
AXIS2_FAILURE);
return status;
@@ -1237,7 +1237,7 @@
svc_grp);
if (AXIS2_SUCCESS != status)
{
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_SVC,
AXIS2_FAILURE);
return status;
@@ -1248,18 +1248,18 @@
arch_reader = axis2_arch_reader_create(env);
if (dep_engine->arch_reader)
{
- AXIS2_ARCH_READER_FREE(dep_engine->arch_reader, env);
+ axis2_arch_reader_free(dep_engine->arch_reader, env);
}
dep_engine->arch_reader = axis2_arch_reader_create(env);
meta_data = axis2_module_desc_create(env);
file_name = axis2_arch_file_data_get_name(dep_engine->
curr_file, env);
- status = AXIS2_ARCH_READER_READ_MODULE_ARCH(
+ status = axis2_arch_reader_read_module_arch(
dep_engine->arch_reader, env, file_name, dep_engine,
meta_data);
if (AXIS2_SUCCESS != status)
{
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1268,7 +1268,7 @@
meta_data);
if (AXIS2_SUCCESS != status)
{
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_MODULE,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1277,7 +1277,7 @@
dep_engine->curr_file = NULL;
break;
}
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
}
}
return AXIS2_SUCCESS;
@@ -1438,9 +1438,9 @@
module_desc = axis2_module_desc_create(env);
arch_reader = axis2_arch_reader_create(env);
file_name = axis2_file_get_name(module_archive, env);
- status = AXIS2_ARCH_READER_READ_MODULE_ARCH(arch_reader, env, file_name,
+ status = axis2_arch_reader_read_module_arch(arch_reader, env, file_name,
dep_engine, module_desc);
- AXIS2_ARCH_READER_FREE(arch_reader, env);
+ axis2_arch_reader_free(arch_reader, env);
if (AXIS2_SUCCESS != status)
{
axis2_module_desc_free(module_desc, env);
@@ -1525,7 +1525,7 @@
if (dep_engine->arch_reader)
{
- AXIS2_ARCH_READER_FREE(dep_engine->arch_reader, env);
+ axis2_arch_reader_free(dep_engine->arch_reader, env);
dep_engine->arch_reader = NULL;
}
dep_engine->arch_reader = arch_reader;
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=519881&r1=519880&r2=519881
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Mon Mar 19 02:12:51 2007
@@ -459,7 +459,7 @@
axis2_handler_desc_t *handler_desc = NULL;
handler_desc = (axis2_handler_desc_t *)
axis2_array_list_get(conf->handlers, env, i);
-
+
if (handler_desc)
axis2_handler_desc_free(handler_desc, env);
}
@@ -957,7 +957,7 @@
def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
}
size = axis2_array_list_size(conf->engaged_modules, env);
-
+
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
@@ -1331,7 +1331,7 @@
return AXIS2_FAILURE;
}
file_name = axis2_qname_get_localpart(module_ref, env);
- file = (axis2_file_t *) AXIS2_ARCH_READER_CREATE_MODULE_ARCH(
+ file = (axis2_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(repos_path, AXIS2_PATH_SEP_STR, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org