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 2005/10/05 07:23:17 UTC
svn commit: r294993 - in /webservices/axis2/trunk/c: include/
modules/core/description/src/ modules/xml/om/src/
Author: damitha
Date: Tue Oct 4 22:22:53 2005
New Revision: 294993
URL: http://svn.apache.org/viewcvs?rev=294993&view=rev
Log:
initially I had defined a type called boolean_t. But it seems
that apr has defined TRUE FALSE. So instead we will use it
Modified:
webservices/axis2/trunk/c/include/axis2.h
webservices/axis2/trunk/c/include/axis2_description_param_include.h
webservices/axis2/trunk/c/include/axis2_errno.h
webservices/axis2/trunk/c/include/axis2_om_namespace.h
webservices/axis2/trunk/c/include/axis2_om_node.h
webservices/axis2/trunk/c/include/axis2_operation_description.h
webservices/axis2/trunk/c/include/axis2_parameter.h
webservices/axis2/trunk/c/include/axis2_qname.h
webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_operation_description.c
webservices/axis2/trunk/c/modules/core/description/src/axis2_parameter.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c
Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Tue Oct 4 22:22:53 2005
@@ -6,6 +6,7 @@
* @brief Axis2c specific global declarations
*/
+#include <apr_general.h>
#include <apr.h>
#include <apr_pools.h>
#include <apr_hash.h>
@@ -15,8 +16,8 @@
#define REALLOC(p,s) (realloc((p),(s)))
#define FREE(p) (free((p)))
-enum boolean_s {false, true};
-typedef enum boolean_s boolean_t;
+/*enum boolean_s {false, true};
+typedef enum boolean_s boolean_t; */
apr_hash_t *axis2_apr_hash_make(apr_pool_t *om_pool);
Modified: webservices/axis2/trunk/c/include/axis2_description_param_include.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_description_param_include.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description_param_include.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description_param_include.h Tue Oct 4 22:22:53 2005
@@ -21,7 +21,7 @@
typedef struct axis2_description_param_include_t
{
apr_hash_t *parameters;
- boolean_t is_locked;
+ int is_locked;
} axis2_description_param_include_t;
/*
@@ -40,11 +40,11 @@
(axis2_description_param_include_t * param_include, char *name);
/* To get all the parameters in a given description */
-apr_hash_t *axis2_descriptin_param_include_get_parameters
+apr_hash_t *axis2_description_param_include_get_parameters
(axis2_description_param_include_t * param_include);
/* To check whether the paramter is locked at any level */
-boolean_t axis2_description_param_include_is_parameter_locked
+int axis2_description_param_include_is_parameter_locked
(axis2_description_param_include_t * param_include, char *param_name);
#endif //AXIS2_DESCRIPTION_PARAM_INCLUDE_H
Modified: webservices/axis2/trunk/c/include/axis2_errno.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_errno.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_errno.h (original)
+++ webservices/axis2/trunk/c/include/axis2_errno.h Tue Oct 4 22:22:53 2005
@@ -15,10 +15,10 @@
*/
#define AXIS2_START_ERROR APR_OS_START_USERERR
-#define AXIS2_START_SPACE 50000
+#define AXIS2_ERROR_SPACE 50000
-#define AXIS2_STATUS AXIS2_START_ERROR + AXIS2_ERROR_SPACE
+#define AXIS2_START_STATUS AXIS2_START_ERROR + AXIS2_ERROR_SPACE
/**
* @defgroup AXIS2_Error AXIS2 Error Values
Modified: webservices/axis2/trunk/c/include/axis2_om_namespace.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_namespace.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_namespace.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_namespace.h Tue Oct 4 22:22:53 2005
@@ -50,6 +50,6 @@
* @return true if ns1 equals ns2 , false otherwise
*/
-boolean_t axis2_om_namespace_equals(axis2_om_namespace_t * ns1, axis2_om_namespace_t * ns2);
+int axis2_om_namespace_equals(axis2_om_namespace_t * ns1, axis2_om_namespace_t * ns2);
#endif // AXIS2_OM_NAMESPACE
Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Tue Oct 4 22:22:53 2005
@@ -65,7 +65,7 @@
struct axis2_om_node_t *last_child;
axis2_stax_om_builder_t *builder;
axis2_om_types_t element_type;
- boolean_t done;
+ int done;
void* data_element;
} axis2_om_node_t;
Modified: webservices/axis2/trunk/c/include/axis2_operation_description.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_operation_description.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_operation_description.h (original)
+++ webservices/axis2/trunk/c/include/axis2_operation_description.h Tue Oct 4 22:22:53 2005
@@ -1,6 +1,7 @@
#ifndef AXIS2_OPERATION_DESCRIPTION_H
#define AXIS2_OPERATION_DESCRIPTION_H
+#include <axis2_description.h>
#include <axis2_description_param_include.h>
typedef struct axis2_operation_description_s axis2_operation_description_t;
@@ -49,10 +50,10 @@
axis2_operation_description_t *create_axis2_operation_description_with_name
(axis2_description_param_include_t *param_include, axis2_qname_t *name);
-void free_axis2_operation_description (axis2_operation_description_t
+int free_axis2_operation_description (axis2_operation_description_t
*operation_desc);
-void axis2_operation_description_add_parameter(axis2_operation_description_t
+int axis2_operation_description_add_parameter(axis2_operation_description_t
*operation_desc, axis2_parameter_t *param);
axis2_parameter_t *axis2_operation_description_get_parameter(
@@ -61,10 +62,10 @@
axis2_parameter_t *axis2_operation_description_get_parameters(
axis2_operation_description_t * operation_desc);
-void axis2_operation_description_set_parent(axis2_operation_description_t *operation_description
- , axis2_service_description_t *service_description);
+int axis2_operation_description_set_parent(axis2_operation_description_t
+ *operation_desc, axis2_service_description_t *service_description);
-axis2_service_description_t *axis2_operation_description_get_parent(axis2_operation_description_t
- *operation_desc);
+axis2_service_description_t *axis2_operation_description_get_parent
+ (axis2_operation_description_t *operation_desc);
#endif //AXIS2_OPERATION_DESCRIPTION_H
Modified: webservices/axis2/trunk/c/include/axis2_parameter.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_parameter.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_parameter.h (original)
+++ webservices/axis2/trunk/c/include/axis2_parameter.h Tue Oct 4 22:22:53 2005
@@ -27,7 +27,7 @@
void *value;
axis2_om_element_t *param_element;
int type;
- boolean_t is_locked;
+ int is_locked;
} axis2_parameter_t;
axis2_parameter_t *axis2_parameter_create ();
@@ -48,10 +48,10 @@
void *axis2_parameter_get_value (axis2_parameter_t * param);
-boolean_t axis2_parameter_is_locked (axis2_parameter_t * param);
+int axis2_parameter_is_locked (axis2_parameter_t * param);
void axis2_parameter_set_locked (axis2_parameter_t * param,
- boolean_t locked);
+ int locked);
void axis2_parameter_set_param_element (axis2_parameter_t * param,
axis2_om_element_t * om_element);
Modified: webservices/axis2/trunk/c/include/axis2_qname.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_qname.h?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/include/axis2_qname.h Tue Oct 4 22:22:53 2005
@@ -50,6 +50,6 @@
*
*/
-boolean_t axis2_qname_equals(axis2_qname_t *qn1,axis2_qname_t *qn2);
+int axis2_qname_equals(axis2_qname_t *qn1,axis2_qname_t *qn2);
#endif // AXIS2_QNAME_H
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_description_param_include.c Tue Oct 4 22:22:53 2005
@@ -76,10 +76,10 @@
}
/* To check whether the paramter is locked at any level */
-boolean_t axis2_description_param_include_is_parameter_locked
+int axis2_description_param_include_is_parameter_locked
(axis2_description_param_include_t * param_include, char *param_name)
{
return ((axis2_parameter_t *)(apr_hash_get
(param_include->parameters, strdup(param_name), APR_HASH_KEY_STRING)))->is_locked;
- return false;
+ return FALSE;
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_operation_description.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_operation_description.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_operation_description.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_operation_description.c Tue Oct 4 22:22:53 2005
@@ -1,24 +1,29 @@
#include <axis2_operation_description.h>
+/* static apr_pool_t *om_pool; */
+
axis2_operation_description_t
*create_axis2_operation_description ()
{
axis2_description_param_include_t * param_include = NULL;
- axis2_operation_description_t *operation_desc = (axis2_operation_description_t *)
+ axis2_operation_description_t *operation_desc
+ = (axis2_operation_description_t *)
malloc (sizeof (axis2_operation_description_t));
if(operation_desc)
{
param_include = (axis2_description_param_include_t *)
- create_axis2_description_param_include();
+ create_axis2_description_param_include();
if(param_include)
{
operation_desc->param_include = param_include;
- operation_desc->parent = NULL;
+ operation_desc->parent = NULL;
+
return operation_desc;
}
else
- fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
+ fprintf(stderr, "*** error_code:%d, %s\n"
+ , AXIS2_ERROR_MEMORY_ALLOCATION
, "AXIS2_ERROR_MEMORY_ALLOCATION");
}
@@ -32,8 +37,9 @@
*create_axis2_operation_description_with_param_include (
axis2_description_param_include_t* param_include)
{
- axis2_operation_description_t *operation_desc = (axis2_operation_description_t *)
- malloc (sizeof (axis2_operation_description_t));
+ axis2_operation_description_t *operation_desc =
+ (axis2_operation_description_t *)
+ malloc (sizeof (axis2_operation_description_t));
if(operation_desc)
{
if(!param_include)
@@ -46,7 +52,8 @@
return operation_desc;
}
else
- fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
+ fprintf(stderr, "*** error_code:%d, %s\n"
+ , AXIS2_ERROR_MEMORY_ALLOCATION
, "AXIS2_ERROR_MEMORY_ALLOCATION");
}
@@ -59,8 +66,9 @@
axis2_operation_description_t *create_axis2_operation_description_with_name
(axis2_description_param_include_t *param_include, axis2_qname_t *name)
{
- axis2_operation_description_t *operation_desc = (axis2_operation_description_t *)
- malloc (sizeof (axis2_operation_description_t));
+ axis2_operation_description_t *operation_desc =
+ (axis2_operation_description_t *)
+ malloc (sizeof (axis2_operation_description_t));
if(operation_desc)
{
if(!param_include)
@@ -75,7 +83,8 @@
return operation_desc;
}
else
- fprintf(stderr, "*** error_code:%d, %s\n", AXIS2_ERROR_MEMORY_ALLOCATION
+ fprintf(stderr, "*** error_code:%d, %s\n"
+ , AXIS2_ERROR_MEMORY_ALLOCATION
, "AXIS2_ERROR_MEMORY_ALLOCATION");
}
@@ -85,35 +94,57 @@
return NULL;
}
-void free_axis2_operation_description (axis2_operation_description_t
+int free_axis2_operation_description (axis2_operation_description_t
*operation_desc)
{
- if(operation_desc)
+ if(operation_desc){
free(operation_desc);
+ return AXIS2_SUCCESS;
+ }
+ return AXIS2_FAILURE;
}
-void axis2_operation_description_add_parameter(axis2_operation_description_t
+int axis2_operation_description_add_parameter(axis2_operation_description_t
*operation_desc, axis2_parameter_t *param)
{
+ apr_hash_set (operation_desc->param_include->parameters, param->name
+ , APR_HASH_KEY_STRING, param);
+ return AXIS2_SUCCESS;
}
axis2_parameter_t *axis2_operation_description_get_parameter(
axis2_operation_description_t *operation_desc, char *name)
{
+ if(operation_desc && operation_desc->param_include)
+ return (axis2_parameter_t *)(apr_hash_get
+ (operation_desc->param_include->parameters, strdup(name)
+ , APR_HASH_KEY_STRING));
+ return NULL;
}
axis2_parameter_t *axis2_operation_description_get_parameters(
axis2_operation_description_t * operation_desc)
{
+ if(operation_desc && operation_desc->param_include)
+ return (axis2_parameter_t *) operation_desc->param_include->parameters;
+ return NULL;
}
-void setParent(axis2_operation_description_t *operation_description
- , axis2_service_description_t *service_description)
+int setParent(axis2_operation_description_t *operation_desc
+ , axis2_service_description_t *service_desc)
{
+ if(operation_desc && service_desc){
+ operation_desc->parent = service_desc;
+ return AXIS2_SUCCESS;
+ }
+ return AXIS2_FAILURE;
}
axis2_service_description_t *getParent(axis2_operation_description_t
*operation_desc)
{
+ if(operation_desc)
+ return operation_desc->parent;
+ else return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/description/src/axis2_parameter.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/axis2_parameter.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/axis2_parameter.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/axis2_parameter.c Tue Oct 4 22:22:53 2005
@@ -58,7 +58,7 @@
return NULL;
}
-boolean_t axis2_parameter_is_locked (axis2_parameter_t * param)
+int axis2_parameter_is_locked (axis2_parameter_t * param)
{
if(param)
return param->is_locked;
@@ -66,7 +66,7 @@
}
void axis2_parameter_set_locked (axis2_parameter_t * param,
- boolean_t is_locked)
+ int is_locked)
{
if(param)
param->is_locked = is_locked;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Tue Oct 4 22:22:53 2005
@@ -58,7 +58,7 @@
(*element_node)->parent = parent;
axis2_om_node_add_child (parent, (*element_node));
}
- (*element_node)->done = true;
+ (*element_node)->done = TRUE;
(*element_node)->element_type = AXIS2_OM_ELEMENT;
(*element_node)->data_element = element;
axis2_om_element_set_namespace ((*element_node), ns);
@@ -123,7 +123,7 @@
node->builder = builder;
node->data_element = element;
- node->done = false;
+ node->done = FALSE;
node->element_type = AXIS2_OM_ELEMENT;
if (parent)
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_namespace.c Tue Oct 4 22:22:53 2005
@@ -58,7 +58,7 @@
}
}
-boolean_t axis2_om_namespace_equals(axis2_om_namespace_t * ns1,
+int axis2_om_namespace_equals(axis2_om_namespace_t * ns1,
axis2_om_namespace_t * ns2)
{
int uris_differ = 0;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_text.c Tue Oct 4 22:22:53 2005
@@ -44,7 +44,7 @@
if(parent && parent->element_type == AXIS2_OM_ELEMENT)
{
- node->done = true;
+ node->done = TRUE;
node->parent = parent;
axis2_om_node_add_child(parent,node);
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c?rev=294993&r1=294992&r2=294993&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c Tue Oct 4 22:22:53 2005
@@ -64,7 +64,7 @@
}
}
-boolean_t axis2_qname_equals(axis2_qname_t *qn1,axis2_qname_t *qn2)
+int axis2_qname_equals(axis2_qname_t *qn1,axis2_qname_t *qn2)
{
int uris_differ = 0;
int localparts_differ = 0;
@@ -73,7 +73,7 @@
{
if( qn1 == qn2)
{
- return true;
+ return TRUE;
}
}
if(qn1->localpart && qn2->localpart)