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 sa...@apache.org on 2005/09/27 10:22:54 UTC
svn commit: r291856 - in /webservices/axis2/trunk/c:
include/axis2c_om_attribute.h include/axis2c_om_element.h
modules/xml/guththila/src/stack.h modules/xml/om/src/axis2c_om_attribute.c
modules/xml/om/src/axis2c_om_element.c
Author: samisa
Date: Tue Sep 27 01:22:40 2005
New Revision: 291856
URL: http://svn.apache.org/viewcvs?rev=291856&view=rev
Log:
Few fixes on compilation errors
Modified:
webservices/axis2/trunk/c/include/axis2c_om_attribute.h
webservices/axis2/trunk/c/include/axis2c_om_element.h
webservices/axis2/trunk/c/modules/xml/guththila/src/stack.h
webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_attribute.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c
Modified: webservices/axis2/trunk/c/include/axis2c_om_attribute.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_attribute.h?rev=291856&r1=291855&r2=291856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_attribute.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_attribute.h Tue Sep 27 01:22:40 2005
@@ -28,10 +28,10 @@
struct om_attribute_s{
char *localname;
char *value;
- om_namespace_t *ns;
+ axis2c_om_namespace_t *ns;
};
-om_attribute_t *create_om_attribute(const char *localname,const char *value,om_namespace_t *ns);
+om_attribute_t *create_om_attribute(const char *localname,const char *value,axis2c_om_namespace_t *ns);
qname_t *om_attribute_get_qname(om_attribute_t *attribute);
void om_attribute_free(om_attribute_t *attr);
Modified: webservices/axis2/trunk/c/include/axis2c_om_element.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_element.h?rev=291856&r1=291855&r2=291856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_element.h Tue Sep 27 01:22:40 2005
@@ -27,26 +27,28 @@
struct om_element_s;
typedef struct om_element_s om_element_t;
-struct om_element_s{
- om_namespace_t *ns; // current namespace
- char *localname;
- //int done;
- int pns_counter; // prefix namespace counter
- apr_hash_t *attributes; // a hashtable for storing attributes
- apr_hash_t *namespaces; // hashtable for storing namespaces
+struct om_element_s {
+ axis2c_om_namespace_t *ns; // current namespace
+ char *localname;
+ //int done;
+ int pns_counter; // prefix namespace counter
+ apr_hash_t *attributes; // a hashtable for storing attributes
+ apr_hash_t *namespaces; // hashtable for storing namespaces
};
-void free_om_element(node_t *element_node);
+void free_om_element(node_t * element_node);
/*
* Create an om element using localname and namespace
*
*/
-node_t *create_om_element(const char *localname,om_namespace_t *ns);
+node_t *create_om_element(const char *localname, axis2c_om_namespace_t * ns);
/*
* create om element using localname namespace and parent element
*
*/
-node_t *create_om_element_with_parent(const char *localname,om_namespace_t *ns,node_t *parent);
+node_t *create_om_element_with_parent(const char *localname,
+ axis2c_om_namespace_t * ns,
+ node_t * parent);
/*
@@ -54,40 +56,63 @@
* start to find from current element and go up the hierarchy
*
*/
-node_t *create_om_element_with_qname_parent(qname_t *qname,node_t *parent);
+node_t *create_om_element_with_qname_parent(qname_t * qname,
+ node_t * parent);
-om_namespace_t *om_element_find_namespace(node_t *element_node,const char *uri,const char *prefix);
+axis2c_om_namespace_t *om_element_find_namespace(node_t * element_node,
+ const char *uri,
+ const char *prefix);
// declare a namespace in current element
-om_namespace_t *om_element_declare_namespace(om_element_t *element,om_namespace_t *ns);
+axis2c_om_namespace_t *om_element_declare_namespace(om_element_t * element,
+ axis2c_om_namespace_t * ns);
-om_namespace_t *om_element_find_declared_namespace(om_element_t *element_node,const char *uri,const char *prefix);
-
-om_attribute_t *om_element_add_attribute(om_element_t *element,om_attribute_t *attribute);
-
-om_attribute_t *om_attribute_add_attribute_with_namespace(node_t* element_node,const char *attribute_name,const char *value,om_namespace_t *ns);
-
-static char* construct_key_from_qname(qname_t *qname);
-
-
-static om_namespace_t *om_element_handle_namespace_with_qname(node_t *element_node,qname_t *qname);
+axis2c_om_namespace_t *om_element_find_declared_namespace(om_element_t *
+ element_node,
+ const char *uri,
+ const char
+ *prefix);
+
+om_attribute_t *om_element_add_attribute(om_element_t * element,
+ om_attribute_t * attribute);
+
+om_attribute_t *om_attribute_add_attribute_with_namespace(node_t *
+ element_node,
+ const char
+ *attribute_name,
+ const char
+ *value,
+ axis2c_om_namespace_t *
+ ns);
+
+static char *construct_key_from_qname(qname_t * qname);
+
+
+static axis2c_om_namespace_t *om_element_handle_namespace_with_qname(node_t
+ *
+ element_node,
+ qname_t
+ *
+ qname);
//void om_element_remove_attribute(om_element_t *element,om_attribute_t *attribute);
-void om_element_set_namespace(node_t *element_node,om_namespace_t *ns);
-
-om_namespace_t *om_element_declare_namespace_with_nsuri_prefix(om_element_t *element,const char* uri,const char *prefix);
+void om_element_set_namespace(node_t * element_node, axis2c_om_namespace_t * ns);
+axis2c_om_namespace_t
+ *om_element_declare_namespace_with_nsuri_prefix(om_element_t * element,
+ const char *uri,
+ const char *prefix);
-#endif // _AXISC_OM_ELEMENT
+#endif // _AXISC_OM_ELEMENT
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/stack.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/stack.h?rev=291856&r1=291855&r2=291856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/stack.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/stack.h Tue Sep 27 01:22:40 2005
@@ -41,7 +41,7 @@
NAMESPACE *namespace;
DEPTH *depth;
ELEMENT *prev;
-};
+} element;
typedef struct stack
{
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_attribute.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_attribute.c?rev=291856&r1=291855&r2=291856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_attribute.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_attribute.c Tue Sep 27 01:22:40 2005
@@ -24,7 +24,7 @@
om_attribute_t *axis2c_create_om_attribute(const char *localname,
const char *value,
- om_namespace_t * ns)
+ axis2c_om_namespace_t * ns)
{
om_attribute_t *attr =
(om_attribute_t *) malloc(sizeof(om_attribute_t));
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c?rev=291856&r1=291855&r2=291856&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c Tue Sep 27 01:22:40 2005
@@ -19,7 +19,7 @@
#include <stdlib.h>
node_t *axis2c_create_om_element(const char *localname,
- om_namespace_t * ns)
+ axis2c_om_namespace_t * ns)
{
node_t *node = axis2c_create_node();
if (node)
@@ -51,7 +51,7 @@
// create an om element using localname namespace and parent element
node_t *axis2c_create_om_element_with_parent(const char *localname,
- om_namespace_t * ns,
+ axis2c_om_namespace_t * ns,
node_t * parent)
{
node_t *curr_node = axis2c_create_om_element(localname, ns);
@@ -92,12 +92,12 @@
}
-om_namespace_t *axis2c_om_element_find_namespace(node_t * element_node,
+axis2c_om_namespace_t *axis2c_om_element_find_namespace(node_t * element_node,
const char *uri,
const char *prefix)
{
//om_element_t *ele=NULL;
- om_namespace_t *ns = NULL;
+ axis2c_om_namespace_t *ns = NULL;
if (!element_node)
{
return NULL;
@@ -130,8 +130,8 @@
// declare a namespace for this om element
-om_namespace_t *axis2c_om_element_declare_namespace(node_t * element_node,
- om_namespace_t * ns)
+axis2c_om_namespace_t *axis2c_om_element_declare_namespace(node_t * element_node,
+ axis2c_om_namespace_t * ns)
{
apr_status_t status;
om_element_t *element = NULL;
@@ -155,7 +155,7 @@
}
-om_namespace_t
+axis2c_om_namespace_t
*axis2c_om_element_declare_namespace_with_ns_uri_prefix(node_t *
element_node,
const char
@@ -163,7 +163,7 @@
const char
*prefix)
{
- om_namespace_t *nsp = NULL;
+ axis2c_om_namespace_t *nsp = NULL;
nsp = axis2c_create_om_namespace(uri, prefix);
if (nsp)
return axis2c_om_element_declare_namespace(element_node, nsp);
@@ -175,7 +175,7 @@
* can be used to retrive a prefix of a known namespace uri
*
*/
-om_namespace_t *axis2c_om_element_find_declared_namespace(node_t *
+axis2c_om_namespace_t *axis2c_om_element_find_declared_namespace(node_t *
element_node,
const char *uri,
const char
@@ -206,14 +206,14 @@
-static om_namespace_t *axis2c_om_element_handle_namespace_with_qname(node_t
+static axis2c_om_namespace_t *axis2c_om_element_handle_namespace_with_qname(node_t
*
element_node,
qname_t
*
qname)
{
- om_namespace_t *pns = NULL;
+ axis2c_om_namespace_t *pns = NULL;
char *ns_uri = qname->ns_uri;
if (ns_uri != NULL)
{
@@ -244,12 +244,12 @@
-static om_namespace_t *axis2c_om_element_handle_namespace(node_t *
+static axis2c_om_namespace_t *axis2c_om_element_handle_namespace(node_t *
element_node,
- om_namespace_t *
+ axis2c_om_namespace_t *
ns)
{
- om_namespace_t *ns1 = NULL;
+ axis2c_om_namespace_t *ns1 = NULL;
if (!ns || !element_node)
{
// namespace null handle condition
@@ -363,10 +363,10 @@
*attribute_name,
const char
*value,
- om_namespace_t
+ axis2c_om_namespace_t
* ns)
{
- om_namespace_t *t = NULL;
+ axis2c_om_namespace_t *t = NULL;
if (!element_node)
{
return NULL;
@@ -421,9 +421,9 @@
}
*/
-void axis2c_om_element_set_namespace(node_t * node, om_namespace_t * ns)
+void axis2c_om_element_set_namespace(node_t * node, axis2c_om_namespace_t * ns)
{
- om_namespace_t *nsp = NULL;
+ axis2c_om_namespace_t *nsp = NULL;
if (ns && node && (node->data_element))
{
nsp = axis2c_om_element_handle_namespace(node, ns);