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 da...@apache.org on 2008/04/02 13:38:20 UTC
svn commit: r643857 - in /webservices/axis2/trunk/c/src/core:
context/conf_ctx.c context/msg_ctx.c context/op_ctx.c context/svc_ctx.c
context/svc_grp_ctx.c util/core_utils.c
Author: damitha
Date: Wed Apr 2 04:38:18 2008
New Revision: 643857
URL: http://svn.apache.org/viewvc?rev=643857&view=rev
Log:
Removing AXIS2_ENV_CHECK
Modified:
webservices/axis2/trunk/c/src/core/context/conf_ctx.c
webservices/axis2/trunk/c/src/core/context/msg_ctx.c
webservices/axis2/trunk/c/src/core/context/op_ctx.c
webservices/axis2/trunk/c/src/core/context/svc_ctx.c
webservices/axis2/trunk/c/src/core/context/svc_grp_ctx.c
webservices/axis2/trunk/c/src/core/util/core_utils.c
Modified: webservices/axis2/trunk/c/src/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/context/conf_ctx.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/src/core/context/conf_ctx.c Wed Apr 2 04:38:18 2008
@@ -54,8 +54,6 @@
{
axis2_conf_ctx_t *conf_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
conf_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_conf_ctx_t));
if (!conf_ctx)
{
@@ -326,8 +324,6 @@
{
axutil_hash_index_t *hi = NULL;
void *ctx = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axutil_thread_mutex_lock(conf_ctx->mutex);
conf_ctx->conf = conf;
Modified: webservices/axis2/trunk/c/src/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/context/msg_ctx.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/src/core/context/msg_ctx.c Wed Apr 2 04:38:18 2008
@@ -223,8 +223,6 @@
{
axis2_msg_ctx_t *msg_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
msg_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_msg_ctx_t));
if (!msg_ctx)
{
@@ -537,7 +535,6 @@
const axutil_env_t * env,
struct axis2_conf * conf)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf, AXIS2_FAILURE);
AXIS2_PARAM_CHECK (env->error, msg_ctx, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/src/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/context/op_ctx.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/src/core/context/op_ctx.c Wed Apr 2 04:38:18 2008
@@ -73,8 +73,6 @@
axis2_op_ctx_t *op_ctx = NULL;
int i = 0;
- AXIS2_ENV_CHECK(env, NULL);
-
op_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_op_ctx_t));
if (!op_ctx)
{
@@ -145,7 +143,6 @@
const axutil_env_t * env)
{
int i = 0;
- AXIS2_ENV_CHECK(env, void);
if (--(op_ctx->ref) > 0)
{
@@ -197,8 +194,6 @@
{
int i = 0;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (op_ctx->op_qname && op_ctx->svc_qname)
{
axis2_svc_t *svc = NULL;
@@ -253,7 +248,6 @@
{
axis2_msg_ctx_t *out_msg_ctx = NULL;
axis2_msg_ctx_t *in_msg_ctx = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axutil_thread_mutex_lock(op_ctx->mutex);
@@ -340,8 +334,6 @@
{
int i = 0;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
for (i = 0; i < AXIS2_WSDL_MESSAGE_LABEL_MAX; i++)
{
if (op_ctx->msg_ctx_array[i])
@@ -360,8 +352,6 @@
const axutil_env_t * env,
struct axis2_svc_ctx * svc_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (svc_ctx)
{
op_ctx->parent = svc_ctx;
@@ -428,7 +418,6 @@
axis2_op_ctx_t * op_ctx,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
op_ctx->ref++;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/src/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/context/svc_ctx.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/src/core/context/svc_ctx.c Wed Apr 2 04:38:18 2008
@@ -118,8 +118,6 @@
struct axis2_svc_ctx *svc_ctx,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (svc_ctx->base)
{
axis2_ctx_free(svc_ctx->base, env);
@@ -135,8 +133,6 @@
const axutil_env_t * env,
axis2_conf_t * conf)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (svc_ctx->svc_qname)
{
axis2_char_t *svc_name =
@@ -169,7 +165,6 @@
const axutil_env_t * env,
axis2_svc_t * svc)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc, AXIS2_FAILURE);
svc_ctx->svc = svc;
@@ -186,7 +181,6 @@
const axis2_svc_ctx_t * svc_ctx,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, NULL);
return axis2_svc_grp_ctx_get_parent(svc_ctx->parent, env);
}
@@ -198,8 +192,6 @@
{
axis2_op_t *op = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
if (svc_ctx->svc)
{
op = axis2_svc_get_op_with_qname(svc_ctx->svc, env, qname);
@@ -208,3 +200,4 @@
return NULL;
}
+
Modified: webservices/axis2/trunk/c/src/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/context/svc_grp_ctx.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/src/core/context/svc_grp_ctx.c Wed Apr 2 04:38:18 2008
@@ -51,8 +51,6 @@
{
axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
svc_grp_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_svc_grp_ctx_t));
if (!svc_grp_ctx)
{
@@ -120,8 +118,6 @@
struct axis2_svc_grp_ctx *svc_grp_ctx,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
-
if (svc_grp_ctx->id)
{
AXIS2_FREE(env->allocator, svc_grp_ctx->id);
@@ -163,8 +159,6 @@
const axutil_env_t * env,
axis2_conf_t * conf)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (svc_grp_ctx->svc_grp_name)
{
svc_grp_ctx->svc_grp =
@@ -188,8 +182,6 @@
const axutil_env_t * env,
const axis2_char_t * id)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
if (svc_grp_ctx->id)
{
AXIS2_FREE(env->allocator, svc_grp_ctx->id);
@@ -222,8 +214,6 @@
axutil_hash_index_t *hi = NULL;
void *next_svc = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_SUCCESS);
-
if (svc_grp_ctx->svc_grp)
{
axutil_hash_t *service_map =
@@ -269,3 +259,4 @@
{
return svc_grp_ctx->svc_ctx_map;
}
+
Modified: webservices/axis2/trunk/c/src/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/util/core_utils.c?rev=643857&r1=643856&r2=643857&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/util/core_utils.c Wed Apr 2 04:38:18 2008
@@ -217,7 +217,6 @@
const axis2_char_t * version)
{
axutil_qname_t *ret_qname = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, name, NULL);
if (version && 0 != axutil_strlen(version))
@@ -255,7 +254,6 @@
axutil_hash_index_t *hi = NULL;
void *val = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, modules_map, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, axis_conf, AXIS2_FAILURE);
@@ -373,7 +371,6 @@
axis2_char_t *name = NULL;
axis2_char_t *version_sep_loc = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
name = axutil_strdup(env, module_name);
@@ -397,7 +394,6 @@
axis2_char_t version_seperator = '-';
axis2_char_t *version_sep_loc = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, module_name, NULL);
version_sep_loc = axutil_rindex(module_name, version_seperator);
@@ -416,7 +412,6 @@
{
double cur_ver = 0.0;
double mod_ver = 0.0;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, module_ver, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, current_def_ver, AXIS2_FALSE);
cur_ver = atof(current_def_ver);
@@ -427,3 +422,4 @@
}
return AXIS2_FAILURE;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org