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 du...@apache.org on 2007/03/09 06:13:50 UTC
svn commit: r516306 - in /webservices/axis2/trunk/c: include/axis2_msg.h
modules/core/description/msg.c
Author: dushshantha
Date: Thu Mar 8 21:13:49 2007
New Revision: 516306
URL: http://svn.apache.org/viewvc?view=rev&rev=516306
Log:
corrected indentation
Modified:
webservices/axis2/trunk/c/include/axis2_msg.h
webservices/axis2/trunk/c/modules/core/description/msg.c
Modified: webservices/axis2/trunk/c/include/axis2_msg.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_msg.h?view=diff&rev=516306&r1=516305&r2=516306
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg.h Thu Mar 8 21:13:49 2007
@@ -28,10 +28,6 @@
* @{
*/
-/**
- * @file axis2_msg.h
- */
-
#include <axis2_param_container.h>
#include <axis2_op.h>
#include <axis2_array_list.h>
@@ -52,6 +48,14 @@
/** Type name for struct axis2_msg */
typedef struct axis2_msg axis2_msg_t;
+ /**
+ * Creates message struct instance.
+ * @param env pointer to environment struct
+ * @return pointer to newly created message
+ */
+ AXIS2_EXTERN axis2_msg_t *AXIS2_CALL
+ axis2_msg_create(const axis2_env_t *env);
+
/**
* Frees message.
* @param msg pointer to message
@@ -225,26 +229,6 @@
axis2_msg_set_name(axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_char_t *name);
-
- /**
- * Gets XML schema element associated with the message.
- * @param msg pointer to message
- * @param env pointer to environment struct
- * @return pointer to XML schema element, returns a reference, not
- * a cloned copy
- */
- /*xml_schema_element_t *AXIS2_CALL
- axis2_msg_get_schema_element(const axis2_msg_t *msg,
- const axis2_env_t *env);*/
-
- /**
- * Creates message struct instance.
- * @param env pointer to environment struct
- * @return pointer to newly created message
- */
- AXIS2_EXTERN axis2_msg_t *AXIS2_CALL
- axis2_msg_create(const axis2_env_t *env);
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=516306&r1=516305&r2=516306
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Thu Mar 8 21:13:49 2007
@@ -35,17 +35,15 @@
};
AXIS2_EXTERN axis2_msg_t *AXIS2_CALL
-axis2_msg_create(
- const axis2_env_t *env)
+axis2_msg_create(const axis2_env_t *env)
{
axis2_msg_t *msg = NULL;
AXIS2_ENV_CHECK(env, NULL);
- msg = (axis2_msg_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_msg_t));
+ msg = (axis2_msg_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_msg_t));
- if (NULL == msg)
+ if (!msg)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -58,17 +56,16 @@
msg->element_qname = NULL;
msg->direction = NULL;
- msg->param_container = (axis2_param_container_t *)
- axis2_param_container_create(env);
- if (NULL == msg->param_container)
+ msg->param_container =
+ (axis2_param_container_t *)axis2_param_container_create(env);
+ if (!msg->param_container)
{
axis2_msg_free(msg, env);
return NULL;
}
-
msg->flow = axis2_array_list_create(env, 0);
- if (NULL == msg->flow)
+ if (!msg->flow)
{
axis2_msg_free(msg, env);
return NULL;
@@ -78,8 +75,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_free(
- axis2_msg_t *msg,
+axis2_msg_free(axis2_msg_t *msg,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -87,31 +83,26 @@
if (msg->flow)
{
axis2_array_list_free(msg->flow, env);
- msg->flow = NULL;
}
if (msg->name)
{
AXIS2_FREE(env->allocator, msg->name);
- msg->name = NULL;
}
if (msg->element_qname)
{
AXIS2_QNAME_FREE(msg->element_qname, env);
- msg->element_qname = NULL;
}
if (msg->direction)
{
AXIS2_FREE(env->allocator, msg->direction);
- msg->direction = NULL;
}
if (msg->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(msg->param_container, env);
- msg->param_container = NULL;
}
msg->parent = NULL;
@@ -119,15 +110,13 @@
if (msg)
{
AXIS2_FREE(env->allocator, msg);
- msg = NULL;
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_add_param(
- axis2_msg_t *msg,
+axis2_msg_add_param(axis2_msg_t *msg,
const axis2_env_t *env,
axis2_param_t *param)
{
@@ -140,43 +129,39 @@
if (AXIS2_TRUE == axis2_msg_is_param_locked(msg, env, param_name))
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
+ AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
{
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(msg->param_container, env, param);
+ return AXIS2_PARAM_CONTAINER_ADD_PARAM(msg->param_container, env,
+ param);
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_param_t *AXIS2_CALL
-axis2_msg_get_param(
- const axis2_msg_t *msg,
+axis2_msg_get_param(const axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, param_name, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(msg->param_container, env, param_name);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_msg_get_all_params(
- const axis2_msg_t *msg,
+axis2_msg_get_all_params(const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, msg->param_container, AXIS2_FALSE);
return AXIS2_PARAM_CONTAINER_GET_PARAMS(msg->param_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_set_parent(
- axis2_msg_t *msg,
+axis2_msg_set_parent(axis2_msg_t *msg,
const axis2_env_t *env,
axis2_op_t *op)
{
@@ -186,27 +171,21 @@
}
AXIS2_EXTERN axis2_op_t *AXIS2_CALL
-axis2_msg_get_parent(
- const axis2_msg_t *msg,
+axis2_msg_get_parent(const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return msg->parent;
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_msg_get_flow(
- const axis2_msg_t *msg,
+axis2_msg_get_flow(const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return msg->flow;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_msg_is_param_locked(
- axis2_msg_t *msg,
+axis2_msg_is_param_locked(axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
@@ -235,8 +214,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_set_flow(
- axis2_msg_t *msg,
+axis2_msg_set_flow(axis2_msg_t *msg,
const axis2_env_t *env,
axis2_array_list_t *flow)
{
@@ -258,13 +236,11 @@
const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return msg->direction;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_set_direction(
- axis2_msg_t *msg,
+axis2_msg_set_direction(axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_char_t *direction)
{
@@ -280,24 +256,23 @@
{
msg->direction = AXIS2_STRDUP(direction, env);
if (!(msg->direction))
+ {
return AXIS2_FAILURE;
+ }
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
-axis2_msg_get_element_qname(
- const axis2_msg_t *msg,
+axis2_msg_get_element_qname(const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return msg->element_qname;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_set_element_qname(
- axis2_msg_t *msg,
+axis2_msg_set_element_qname(axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_qname_t *element_qname)
{
@@ -313,78 +288,23 @@
{
msg->element_qname = AXIS2_QNAME_CLONE((axis2_qname_t *)element_qname, env);
if (!(msg->element_qname))
+ {
return AXIS2_FAILURE;
+ }
}
return AXIS2_SUCCESS;
}
-
-/*AXIS2_EXTERN xml_schema_element_t *AXIS2_CALL
-axis2_msg_get_schema_element(
- const axis2_msg_t *msg,
- const axis2_env_t *env)
-{
- axis2_op_t *operation = NULL;
- axis2_svc_t *svc = NULL;
- axis2_array_list_t *schemas = NULL;
- int i = 0;
- int schemas_size = 0;
-
- AXIS2_ENV_CHECK(env, NULL);
-
- operation = axis2_msg_get_parent(msg, env);
- svc = axis2_op_get_parent(operation, env);
- schemas = AXIS2_SVC_GET_ALL_SCHEMAS(svc, env);
- schemas_size = AXIS2_ARRAY_LIST_SIZE(schemas, env);
- for (i = 0; i < schemas_size; i++)
- {
- xml_schema_t *schema = NULL;
- xml_schema_obj_collection_t *schema_collection = NULL;
-
- schema = axis2_array_list_get(schemas, env, i);
- schema_collection = XML_SCHEMA_GET_ITEMS(schema, env);
- if (schema_collection)
- {
- int count = 0;
- int j = 0;
-
- count = XML_SCHEMA_OBJ_COLLECTION_GET_COUNT(schema_collection, env);
- for (j = 0; j < count; j++)
- {
- xml_schema_obj_t *schema_obj = NULL;
- schema_obj = XML_SCHEMA_OBJ_COLLECTION_GET_ITEM(
- schema_collection, env, j);
- if (NULL == schema_obj && XML_SCHEMA_ELEMENT ==
- XML_SCHEMA_OBJ_GET_TYPE(schema_obj, env))
- {
- axis2_qname_t *schema_qname = NULL;
- schema_qname = XML_SCHEMA_ELEMENT_GET_QNAME(schema_obj, env);
- if (msg->element_qname && AXIS2_TRUE ==
- AXIS2_QNAME_EQUALS(msg->element_qname, env,
- schema_qname))
- {
- return (xml_schema_element_t*)schema_obj;
- }
- }
- }
- }
- }
- return NULL;
-}*/
-
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
-axis2_msg_get_name(
- const axis2_msg_t *msg,
+axis2_msg_get_name(const axis2_msg_t *msg,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return msg->name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_msg_set_name(
- axis2_msg_t *msg,
+axis2_msg_set_name(axis2_msg_t *msg,
const axis2_env_t *env,
const axis2_char_t *name)
{
@@ -407,3 +327,5 @@
return AXIS2_SUCCESS;
}
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org