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/08 08:44:04 UTC
svn commit: r515955 - in /webservices/axis2/trunk/c: ./ include/
modules/core/deployment/ modules/core/description/ modules/core/engine/
modules/core/phaseresolver/
Author: pini
Date: Wed Mar 7 23:44:03 2007
New Revision: 515955
URL: http://svn.apache.org/viewvc?view=rev&rev=515955
Log:
Dropped macros, fixed indentation.
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_phase_rule.h
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.c
webservices/axis2/trunk/c/modules/core/description/phase_rule.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed Mar 7 23:44:03 2007
@@ -58,7 +58,7 @@
#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -g"
+ CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g"
# CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
LDFLAGS="$LDFLAGS -lpthread"
Modified: webservices/axis2/trunk/c/include/axis2_phase_rule.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_phase_rule.h?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_phase_rule.h (original)
+++ webservices/axis2/trunk/c/include/axis2_phase_rule.h Wed Mar 7 23:44:03 2007
@@ -193,58 +193,6 @@
axis2_phase_rule_create(const axis2_env_t *env,
const axis2_char_t *name);
-/** Gets name of the handler before which the handler associated with this rule
- is to be placed. */
-#define AXIS2_PHASE_RULE_GET_BEFORE(phase_rule, env) \
- axis2_phase_rule_get_before(phase_rule, env)
-
-/** Sets name of the handler before which the handler associated with this rule
- is to be placed. */
-#define AXIS2_PHASE_RULE_SET_BEFORE(phase_rule, env, before) \
- axis2_phase_rule_set_before(phase_rule, env, before)
-
-/** Gets name of the handler after which the handler associated with this rule
- is to be placed. */
-#define AXIS2_PHASE_RULE_GET_AFTER(phase_rule, env) \
- axis2_phase_rule_get_after(phase_rule, env)
-
-/** Sets name of the handler after which the handler associated with this rule
- is to be placed. */
-#define AXIS2_PHASE_RULE_SET_AFTER(phase_rule, env, after) \
- axis2_phase_rule_set_after(phase_rule, env, after)
-
-/** Gets name. */
-#define AXIS2_PHASE_RULE_GET_NAME(phase_rule, env) \
- axis2_phase_rule_get_name(phase_rule, env)
-
-/** Sets name. */
-#define AXIS2_PHASE_RULE_SET_NAME(phase_rule, env, name)\
- axis2_phase_rule_set_name(phase_rule, env, name)
-
-/** Checks if the associated handler is the first in phase. */
-#define AXIS2_PHASE_RULE_IS_FIRST(phase_rule, env) \
- axis2_phase_rule_is_first(phase_rule, env)
-
-/** Sets the associated handler to be the first in phase. */
-#define AXIS2_PHASE_RULE_SET_FIRST(phase_rule, env, first) \
- axis2_phase_rule_set_first(phase_rule, env, first)
-
-/** Checks if the associated handler is the last in phase. */
-#define AXIS2_PHASE_RULE_IS_LAST(phase_rule, env) \
- axis2_phase_rule_is_last(phase_rule, env)
-
-/** Sets the associated handler to be the last in phase. */
-#define AXIS2_PHASE_RULE_SET_LAST(phase_rule, env, last) \
- axis2_phase_rule_set_last(phase_rule, env, last)
-
-/** Frees phase rule. */
-#define AXIS2_PHASE_RULE_FREE(phase_rule, env) \
- axis2_phase_rule_free(phase_rule, env)
-
-/** Clones given phase rule. */
-#define AXIS2_PHASE_RULE_CLONE(phase_rule, env) \
- axis2_phase_rule_clone(phase_rule, env)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 7 23:44:03 2007
@@ -530,7 +530,7 @@
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
- status = AXIS2_PHASE_RULE_SET_AFTER(phase_rule, env, value);
+ status = axis2_phase_rule_set_after(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
axis2_handler_desc_free(handler_desc, env);
@@ -541,7 +541,7 @@
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
- status = AXIS2_PHASE_RULE_SET_BEFORE(phase_rule, env, value);
+ status = axis2_phase_rule_set_before(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
axis2_handler_desc_free(handler_desc, env);
@@ -552,7 +552,7 @@
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
- status = AXIS2_PHASE_RULE_SET_NAME(phase_rule, env, value);
+ status = axis2_phase_rule_set_name(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
axis2_handler_desc_free(handler_desc, env);
@@ -569,7 +569,7 @@
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
- status = AXIS2_PHASE_RULE_SET_FIRST(phase_rule, env,
+ status = axis2_phase_rule_set_first(phase_rule, env,
AXIS2_TRUE);
if (AXIS2_SUCCESS != status)
{
@@ -582,7 +582,7 @@
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
- status = AXIS2_PHASE_RULE_SET_FIRST(phase_rule, env,
+ status = axis2_phase_rule_set_first(phase_rule, env,
AXIS2_FALSE);
if (AXIS2_SUCCESS != status)
{
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Wed Mar 7 23:44:03 2007
@@ -127,12 +127,12 @@
if (handler_desc->rules)
{
- AXIS2_PHASE_RULE_FREE(handler_desc->rules, env);
+ axis2_phase_rule_free(handler_desc->rules, env);
}
if (phase_rule)
{
- handler_desc->rules = AXIS2_PHASE_RULE_CLONE(phase_rule, env);
+ handler_desc->rules = axis2_phase_rule_clone(phase_rule, env);
if (!(handler_desc->rules))
{
return AXIS2_FAILURE;
@@ -291,7 +291,7 @@
if (handler_desc->rules)
{
- AXIS2_PHASE_RULE_FREE(handler_desc->rules, env);
+ axis2_phase_rule_free(handler_desc->rules, env);
}
if (handler_desc->handler)
Modified: webservices/axis2/trunk/c/modules/core/description/phase_rule.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/phase_rule.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/phase_rule.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/phase_rule.c Wed Mar 7 23:44:03 2007
@@ -36,8 +36,7 @@
};
AXIS2_EXTERN axis2_phase_rule_t *AXIS2_CALL
-axis2_phase_rule_create(
- const axis2_env_t *env,
+axis2_phase_rule_create(const axis2_env_t *env,
const axis2_char_t *name)
{
axis2_phase_rule_t *phase_rule = NULL;
@@ -67,18 +66,14 @@
}
const axis2_char_t *AXIS2_CALL
-axis2_phase_rule_get_before(
- const axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_get_before(const axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
-
{
- AXIS2_ENV_CHECK(env, NULL);
return phase_rule->before;
}
axis2_status_t AXIS2_CALL
-axis2_phase_rule_set_before(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_set_before(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env,
const axis2_char_t *before)
{
@@ -87,7 +82,6 @@
if (phase_rule->before)
{
AXIS2_FREE(env->allocator, phase_rule->before);
- phase_rule->before = NULL;
}
if (before)
@@ -105,17 +99,14 @@
}
const axis2_char_t *AXIS2_CALL
-axis2_phase_rule_get_after(
- const axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_get_after(const axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return phase_rule->after;
}
axis2_status_t AXIS2_CALL
-axis2_phase_rule_set_after(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_set_after(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env,
const axis2_char_t *after)
{
@@ -124,7 +115,6 @@
if (phase_rule->after)
{
AXIS2_FREE(env->allocator, phase_rule->after);
- phase_rule->after = NULL;
}
if (after)
@@ -142,17 +132,14 @@
}
const axis2_char_t *AXIS2_CALL
-axis2_phase_rule_get_name(
- const axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_get_name(const axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return phase_rule->name;
}
axis2_status_t AXIS2_CALL
-axis2_phase_rule_set_name(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_set_name(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env,
const axis2_char_t *name)
{
@@ -161,7 +148,6 @@
if (phase_rule->name)
{
AXIS2_FREE(env->allocator, phase_rule->name);
- phase_rule->name = NULL;
}
if (name)
@@ -176,12 +162,10 @@
}
return AXIS2_SUCCESS;
-
}
axis2_bool_t AXIS2_CALL
-axis2_phase_rule_is_first(
- const axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_is_first(const axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -189,8 +173,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_phase_rule_set_first(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_set_first(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env,
axis2_bool_t first)
{
@@ -200,8 +183,7 @@
}
axis2_bool_t AXIS2_CALL
-axis2_phase_rule_is_last(
- const axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_is_last(const axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -209,8 +191,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_phase_rule_set_last(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_set_last(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env,
axis2_bool_t last)
{
@@ -219,10 +200,8 @@
return AXIS2_SUCCESS;
}
-
axis2_status_t AXIS2_CALL
-axis2_phase_rule_free(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_free(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -230,30 +209,25 @@
if (phase_rule->before)
{
AXIS2_FREE(env->allocator, phase_rule->before);
- phase_rule->before = NULL;
}
if (phase_rule->after)
{
AXIS2_FREE(env->allocator, phase_rule->after);
- phase_rule->after = NULL;
}
if (phase_rule->name)
{
AXIS2_FREE(env->allocator, phase_rule->name);
- phase_rule->name = NULL;
}
AXIS2_FREE(env->allocator, phase_rule);
- phase_rule = NULL;
return AXIS2_SUCCESS;
}
axis2_phase_rule_t *AXIS2_CALL
-axis2_phase_rule_clone(
- axis2_phase_rule_t *phase_rule,
+axis2_phase_rule_clone(axis2_phase_rule_t *phase_rule,
const axis2_env_t *env)
{
axis2_phase_rule_t *phase_rule_new = NULL;
@@ -263,20 +237,22 @@
if (!phase_rule_new)
return NULL;
- AXIS2_PHASE_RULE_SET_BEFORE(phase_rule_new, env,
- AXIS2_PHASE_RULE_GET_BEFORE(phase_rule, env));
+ axis2_phase_rule_set_before(phase_rule_new, env,
+ axis2_phase_rule_get_before(phase_rule, env));
- AXIS2_PHASE_RULE_SET_AFTER(phase_rule_new, env,
- AXIS2_PHASE_RULE_GET_AFTER(phase_rule, env));
+ axis2_phase_rule_set_after(phase_rule_new, env,
+ axis2_phase_rule_get_after(phase_rule, env));
- AXIS2_PHASE_RULE_SET_NAME(phase_rule_new, env,
- AXIS2_PHASE_RULE_GET_NAME(phase_rule, env));
+ axis2_phase_rule_set_name(phase_rule_new, env,
+ axis2_phase_rule_get_name(phase_rule, env));
- AXIS2_PHASE_RULE_SET_FIRST(phase_rule_new, env,
- AXIS2_PHASE_RULE_IS_FIRST(phase_rule, env));
+ axis2_phase_rule_set_first(phase_rule_new, env,
+ axis2_phase_rule_is_first(phase_rule, env));
- AXIS2_PHASE_RULE_SET_LAST(phase_rule_new, env,
- AXIS2_PHASE_RULE_IS_LAST(phase_rule, env));
+ axis2_phase_rule_set_last(phase_rule_new, env,
+ axis2_phase_rule_is_last(phase_rule, env));
return phase_rule_new;
}
+
+
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Wed Mar 7 23:44:03 2007
@@ -436,8 +436,8 @@
return AXIS2_FAILURE;
}
- before = AXIS2_PHASE_RULE_GET_BEFORE(rules, env);
- after = AXIS2_PHASE_RULE_GET_AFTER(rules, env);
+ before = axis2_phase_rule_get_before(rules, env);
+ after = axis2_phase_rule_get_after(rules, env);
if (before && after)
{
@@ -554,8 +554,8 @@
return AXIS2_FAILURE;
}
- first = AXIS2_PHASE_RULE_IS_FIRST(rules, env);
- last = AXIS2_PHASE_RULE_IS_LAST(rules, env);
+ first = axis2_phase_rule_is_first(rules, env);
+ last = axis2_phase_rule_is_last(rules, env);
if (first && last)
{
@@ -646,7 +646,7 @@
if (!rules)
return AXIS2_TRUE;
- before = AXIS2_PHASE_RULE_GET_BEFORE(rules, env);
+ before = axis2_phase_rule_get_before(rules, env);
if (!before)
return AXIS2_TRUE;
@@ -693,7 +693,7 @@
if (!rules)
return AXIS2_TRUE;
- after = AXIS2_PHASE_RULE_GET_AFTER(rules, env);
+ after = axis2_phase_rule_get_after(rules, env);
if (!after)
return AXIS2_TRUE;
@@ -737,7 +737,7 @@
return AXIS2_FAILURE;
}
- before = AXIS2_PHASE_RULE_GET_BEFORE(rules, env);
+ before = axis2_phase_rule_get_before(rules, env);
if (!before)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -831,7 +831,7 @@
return AXIS2_FAILURE;
}
- after = AXIS2_PHASE_RULE_GET_AFTER(rules, env);
+ after = axis2_phase_rule_get_after(rules, env);
if (!after)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -937,14 +937,14 @@
return AXIS2_FAILURE;
}
- before_name = AXIS2_PHASE_RULE_GET_BEFORE(rules, env);
+ before_name = axis2_phase_rule_get_before(rules, env);
if (!before_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- after_name = AXIS2_PHASE_RULE_GET_AFTER(rules, env);
+ after_name = axis2_phase_rule_get_after(rules, env);
if (!after_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Wed Mar 7 23:44:03 2007
@@ -187,7 +187,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, handler, AXIS2_FAILURE);
- phase_name = AXIS2_PHASE_RULE_GET_NAME(
+ phase_name = axis2_phase_rule_get_name(
axis2_handler_desc_get_rules(handler, env), env);
if (AXIS2_TRUE == axis2_phase_holder_is_phase_exist(phase_holder, env,
phase_name))
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=515955&r1=515954&r2=515955
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Mar 7 23:44:03 2007
@@ -421,7 +421,7 @@
metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = axis2_handler_desc_get_rules(metadata, env);
- phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
+ phase_name = axis2_phase_rule_get_name(phase_rule, env);
if (NULL == phase_name)
{
return AXIS2_FAILURE;
@@ -530,7 +530,7 @@
phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
- phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
+ phase_name = axis2_phase_rule_get_name(phase_rule, env);
}
/* TODO change this in proper way */
@@ -783,7 +783,7 @@
rule = axis2_handler_desc_get_rules(metadata, env);
if (rule)
{
- status = AXIS2_PHASE_RULE_SET_NAME(rule, env,
+ status = axis2_phase_rule_set_name(rule, env,
AXIS2_TRANSPORT_PHASE);
}
if (AXIS2_SUCCESS != status)
@@ -921,7 +921,7 @@
rule = axis2_handler_desc_get_rules(metadata, env);
if (rule)
{
- status = AXIS2_PHASE_RULE_SET_NAME(rule, env,
+ status = axis2_phase_rule_set_name(rule, env,
AXIS2_TRANSPORT_PHASE);
}
if (AXIS2_SUCCESS != status)
@@ -1230,7 +1230,7 @@
phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
- phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
+ phase_name = axis2_phase_rule_get_name(phase_rule, env);
}
if (!phase_name)
{
@@ -1374,7 +1374,7 @@
phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
- phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
+ phase_name = axis2_phase_rule_get_name(phase_rule, env);
}
if (!phase_name)
{
@@ -1581,7 +1581,7 @@
metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = axis2_handler_desc_get_rules(metadata, env);
- phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
+ phase_name = axis2_phase_rule_get_name(phase_rule, env);
if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name)) &&
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org