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/28 02:49:39 UTC
svn commit: r292077 - in /webservices/axis2/trunk/c: include/
modules/xml/om/src/
Author: samisa
Date: Tue Sep 27 17:49:20 2005
New Revision: 292077
URL: http://svn.apache.org/viewcvs?rev=292077&view=rev
Log:
more fixes on name related refactorng
Modified:
webservices/axis2/trunk/c/include/axis2c.h
webservices/axis2/trunk/c/include/axis2c_errno.h
webservices/axis2/trunk/c/include/axis2c_node.h
webservices/axis2/trunk/c/include/axis2c_om_attribute.h
webservices/axis2/trunk/c/include/axis2c_om_comment.h
webservices/axis2/trunk/c/include/axis2c_om_container.h
webservices/axis2/trunk/c/include/axis2c_om_doctype.h
webservices/axis2/trunk/c/include/axis2c_om_document.h
webservices/axis2/trunk/c/include/axis2c_om_element.h
webservices/axis2/trunk/c/include/axis2c_om_processing_instruction.h
webservices/axis2/trunk/c/include/axis2c_om_text.h
webservices/axis2/trunk/c/include/axis2c_qname.h
webservices/axis2/trunk/c/include/axis2c_stax_ombuilder.h
webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_document.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_element.c
Modified: webservices/axis2/trunk/c/include/axis2c.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c.h (original)
+++ webservices/axis2/trunk/c/include/axis2c.h Tue Sep 27 17:49:20 2005
@@ -23,5 +23,4 @@
*/
-#endif /* AXIS2C_H */
-
+#endif /* AXIS2C_H */
Modified: webservices/axis2/trunk/c/include/axis2c_errno.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_errno.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_errno.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_errno.h Tue Sep 27 17:49:20 2005
@@ -68,4 +68,4 @@
/** @} */
-#endif /* AXIS2C_ERRNO_H */
+#endif /* AXIS2C_ERRNO_H */
Modified: webservices/axis2/trunk/c/include/axis2c_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_node.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_node.h Tue Sep 27 17:49:20 2005
@@ -21,18 +21,18 @@
#include <apr_pools.h>
#include <xmlpullparser.h>
-static apr_pool_t *om_pool; // a memory pool to be used for this module
+static apr_pool_t *om_pool; // a memory pool to be used for this module
-enum omtypes{
- OM_DOCUMENT=10,
- OM_ELEMENT=20,
- OM_DOCTYPE=30,
- OM_COMMENT=40,
- OM_ATTRIBUTE=50,
- OM_NAMESPACE=60,
- OM_PI=70,
- OM_TEXT=80
+enum omtypes {
+ OM_DOCUMENT = 10,
+ OM_ELEMENT = 20,
+ OM_DOCTYPE = 30,
+ OM_COMMENT = 40,
+ OM_ATTRIBUTE = 50,
+ OM_NAMESPACE = 60,
+ OM_PI = 70,
+ OM_TEXT = 80
};
/*
@@ -42,17 +42,17 @@
* element_type - the type of the element one of omtypes
* data_element - stores the structs created for storing xml
*/
-typedef struct axis2c_node_t{
- struct axis2c_node_t *parent;
- struct axis2c_node_t *prev_sibling;
- struct axis2c_node_t *next_sibling;
- struct axis2c_node_t *first_child;
- struct axis2c_node_t *last_child;
- XML_PullParser *parser;
- int element_type;
- int done;
- void* data_element;
-}axis2c_node_t;
+typedef struct axis2c_node_t {
+ struct axis2c_node_t *parent;
+ struct axis2c_node_t *prev_sibling;
+ struct axis2c_node_t *next_sibling;
+ struct axis2c_node_t *first_child;
+ struct axis2c_node_t *last_child;
+ XML_PullParser *parser;
+ int element_type;
+ int done;
+ void *data_element;
+} axis2c_node_t;
//create a node and allocate memory
@@ -60,23 +60,25 @@
//free a given nod
void axis2c_free_node(axis2c_node_t *);
// add a node as a child of parent node
-void axis2c_node_add_child(axis2c_node_t *parent,axis2c_node_t *child);
+void axis2c_node_add_child(axis2c_node_t * parent, axis2c_node_t * child);
// detach a node form the parent and reset the other links
-axis2c_node_t *axis2c_node_detach(axis2c_node_t *node_to_detach);
+axis2c_node_t *axis2c_node_detach(axis2c_node_t * node_to_detach);
// insert a sibling node
-void axis2c_node_insert_sibling_after(axis2c_node_t *current_ele,axis2c_node_t *nodeto_insert);
-void axis2c_node_insert_sibling_before(axis2c_node_t *current_ele,axis2c_node_t *nodeto_insert);
+void axis2c_node_insert_sibling_after(axis2c_node_t * current_ele,
+ axis2c_node_t * nodeto_insert);
+void axis2c_node_insert_sibling_before(axis2c_node_t * current_ele,
+ axis2c_node_t * nodeto_insert);
// build the tree
-int axis2c_node_build(axis2c_node_t *node);
+int axis2c_node_build(axis2c_node_t * node);
-void axis2c_node_set_parent(axis2c_node_t *parent);
+void axis2c_node_set_parent(axis2c_node_t * parent);
-axis2c_node_t *axis2c_node_get_next_sibling(axis2c_node_t *node);
+axis2c_node_t *axis2c_node_get_next_sibling(axis2c_node_t * node);
-axis2c_node_t *axis2c_node_set_next_sibling(axis2c_node_t *node);
+axis2c_node_t *axis2c_node_set_next_sibling(axis2c_node_t * node);
@@ -87,4 +89,4 @@
-#endif // AXIS2C_NODE
+#endif // AXIS2C_NODE
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=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_attribute.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_attribute.h Tue Sep 27 17:49:20 2005
@@ -21,20 +21,23 @@
#include <axis2c_node.h>
#include <axis2c_om_namespace.h>
-typedef struct axis2c_om_attribute_t{
- char *localname;
- char *value;
- axis2c_om_namespace_t *ns;
-}axis2c_om_attribute_t;
+typedef struct axis2c_om_attribute_t {
+ char *localname;
+ char *value;
+ axis2c_om_namespace_t *ns;
+} axis2c_om_attribute_t;
-axis2c_om_attribute_t *axis2c_create_om_attribute(const char *localname,const char *value, axis2c_om_namespace_t *ns);
-axis2c_qname_t *axis2c_om_attribute_get_qname(axis2c_om_attribute_t *attribute);
-void axis2c_om_attribute_free(axis2c_om_attribute_t *attr);
+axis2c_om_attribute_t *axis2c_create_om_attribute(const char *localname,
+ const char *value,
+ axis2c_om_namespace_t *
+ ns);
+axis2c_qname_t *axis2c_om_attribute_get_qname(axis2c_om_attribute_t *
+ attribute);
+void axis2c_om_attribute_free(axis2c_om_attribute_t * attr);
-#endif // _AXISC_ATTRIBUTE_H_
-
+#endif // _AXISC_ATTRIBUTE_H_
Modified: webservices/axis2/trunk/c/include/axis2c_om_comment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_comment.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_comment.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_comment.h Tue Sep 27 17:49:20 2005
@@ -19,18 +19,11 @@
#include <axis2c_node.h>
-typedef struct axis2c_om_comment_t
-{
- char *value;
-}axis2c_om_comment_t;
+typedef struct axis2c_om_comment_t {
+ char *value;
+} axis2c_om_comment_t;
axis2c_node_t *axis2c_create_om_comment(const char *value);
-void axis2c_om_comment_free(axis2c_om_comment_t *comment_node);
-
-#endif // AXIS2C_OM_COMMENT_H
-
-
-
-
-
+void axis2c_om_comment_free(axis2c_om_comment_t * comment_node);
+#endif // AXIS2C_OM_COMMENT_H
Modified: webservices/axis2/trunk/c/include/axis2c_om_container.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_container.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_container.h Tue Sep 27 17:49:20 2005
@@ -19,9 +19,6 @@
struct om_container_s;
typedef struct om_container_s om_container_t;
-struct om_container_s{
- axis2c_node_t *tree;
+struct om_container_s {
+ axis2c_node_t *tree;
};
-
-
-
Modified: webservices/axis2/trunk/c/include/axis2c_om_doctype.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_doctype.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_doctype.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_doctype.h Tue Sep 27 17:49:20 2005
@@ -24,7 +24,7 @@
typedef struct axis2c_om_doctype_t {
char *value;
-}axis2c_om_doctype_t;
+} axis2c_om_doctype_t;
axis2c_node_t *create_om_doctype(const char *value);
char *om_text_get_text(axis2c_node_t * text_node);
Modified: webservices/axis2/trunk/c/include/axis2c_om_document.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_document.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_document.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_document.h Tue Sep 27 17:49:20 2005
@@ -19,18 +19,17 @@
#include <axis2c_node.h>
-typedef struct axis2c_om_document_t
-{
- axis2c_node_t *root_element;
- axis2c_node_t *first_child;
- axis2c_node_t *last_child;
-};
+typedef struct axis2c_om_document_t {
+ axis2c_node_t *root_element;
+ axis2c_node_t *first_child;
+ axis2c_node_t *last_child;
+ char *char_set_encoding;
+} axis2c_om_document_t;
axis2c_om_document_t *axis2c_create_om_document();
-void axis2c_free_om_document(axis2c_om_document_t *document);
+void axis2c_free_om_document(axis2c_om_document_t * document);
-#endif // AXIS2C_OM_DOCUMENT_H
-
+#endif // AXIS2C_OM_DOCUMENT_H
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=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_element.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_element.h Tue Sep 27 17:49:20 2005
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef _AXISC_OM_ELEMENT_H_
-#define _AXISC_OM_ELEMENT_H_
+#ifndef AXIS2C_OM_ELEMENT_H
+#define AXIS2C_OM_ELEMENT_H
#include <axis2c_om_namespace.h>
#include <axis2c_om_container.h>
@@ -24,32 +24,31 @@
#include <apr.h>
#include <apr_hash.h>
-struct om_element_s;
-typedef struct om_element_s om_element_t;
-
-struct om_element_s {
+typedef struct axis2c_om_element_t {
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
-};
+} axis2c_om_element_t;
-void free_om_element(node_t * element_node);
+void axis2c_free_om_element(axis2c_om_element_t* element_node);
/*
* Create an om element using localname and namespace
*
*/
-axis2c_node_t *create_om_element(const char *localname,
- axis2c_om_namespace_t * ns);
+axis2c_node_t *axis2c_create_om_element(const char *localname,
+ axis2c_om_namespace_t * ns);
/*
* create om element using localname namespace and parent element
*
*/
-axis2c_node_t *create_om_element_with_parent(const char *localname,
- axis2c_om_namespace_t * ns,
- axis2c_node_t * parent);
+axis2c_node_t *axis2c_create_om_element_with_parent(const char *localname,
+ axis2c_om_namespace_t *
+ ns,
+ axis2c_node_t *
+ parent);
/*
@@ -57,60 +56,66 @@
* start to find from current element and go up the hierarchy
*
*/
-axis2c_node_t *create_om_element_with_qname_parent(qname_t * qname,
- axis2c_node_t * parent);
+axis2c_node_t *axis2c_create_om_element_with_qname_parent(axis2c_qname_t *
+ qname,
+ axis2c_node_t *
+ parent);
-axis2c_om_namespace_t *om_element_find_namespace(node_t * element_node,
- const char *uri,
- const char *prefix);
+axis2c_om_namespace_t *axis2c_om_element_find_namespace(axis2c_om_element_t*
+ element_node,
+ const char *uri,
+ const char
+ *prefix);
// declare a namespace in current element
-axis2c_om_namespace_t *om_element_declare_namespace(om_element_t * element,
- axis2c_om_namespace_t *
- ns);
+axis2c_om_namespace_t
+ *axis2c_om_element_declare_namespace(axis2c_om_element_t * element,
+ axis2c_om_namespace_t * ns);
-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);
+axis2c_om_namespace_t
+ *axis2c_om_element_find_declared_namespace(axis2c_om_element_t *
+ element_node,
+ const char *uri, const char
+ *prefix);
+
+axis2c_om_attribute_t *axis2c_om_element_add_attribute(axis2c_om_element_t
+ * element,
+ axis2c_om_attribute_t
+ * attribute);
+
+axis2c_om_attribute_t
+ *axis2c_om_attribute_add_attribute_with_namespace(axis2c_node_t *
+ element_node,
+ const char
+ *attribute_name, const char
+ *value,
+ axis2c_om_namespace_t
+ * ns);
+
+static char *axis2c_construct_key_from_qname(axis2c_qname_t * qname);
+
+
+static axis2c_om_namespace_t
+ *axis2c_om_element_handle_namespace_with_qname(axis2c_node_t *
+ element_node,
+ axis2c_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,
- axis2c_om_namespace_t * ns);
+void axis2c_om_element_set_namespace(axis2c_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);
+ *
+axis2c_om_element_declare_namespace_with_nsuri_prefix(axis2c_om_element_t *
+ element,
+ const char *uri,
+ const char *prefix);
@@ -118,4 +123,4 @@
-#endif // _AXISC_OM_ELEMENT
+#endif // AXIS2C_OM_ELEMENT
Modified: webservices/axis2/trunk/c/include/axis2c_om_processing_instruction.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_processing_instruction.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_processing_instruction.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_processing_instruction.h Tue Sep 27 17:49:20 2005
@@ -19,22 +19,31 @@
#include <axis2c_node.h>
typedef struct axis2c_om_processing_instruction_t {
- char *target;
- char *value;
-}axis2c_om_processing_instruction_t;
+ char *target;
+ char *value;
+} axis2c_om_processing_instruction_t;
-axis2c_node_t *axis2c_create_om_processing_instruction_with_parent(axis2c_node_t *parent,const char *target,const char *value);
+axis2c_node_t
+ *axis2c_create_om_processing_instruction_with_parent(axis2c_node_t *
+ parent,
+ const char
+ *target,
+ const char
+ *value);
-axis2c_node_t *axis2c_create_om_processing_instruction(axis2c_node_t *parent);
+axis2c_node_t *axis2c_create_om_processing_instruction(axis2c_node_t *
+ parent);
-void axis2c_om_processing_instruction_serialize_with_cache(FILE *output_stream);
+void axis2c_om_processing_instruction_serialize_with_cache(FILE *
+ output_stream);
-void axis2c_om_processing_instruction_discard(axis2c_om_processing_instruction_t *om_pi);
+void
+axis2c_om_processing_instruction_discard(axis2c_om_processing_instruction_t
+ * om_pi);
-#endif // AXIS2C_OM_PI_H
-
+#endif // AXIS2C_OM_PI_H
Modified: webservices/axis2/trunk/c/include/axis2c_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_om_text.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_om_text.h Tue Sep 27 17:49:20 2005
@@ -18,22 +18,22 @@
#define AXIS2C_OM_TEXT_H
#include <axis2c_om_attribute.h>
-typedef struct axis2c_om_text_t
-{
- char *value;
- // mtom stuff should go here
- char *mime_type;
- int optimize;
- int is_binary;
- char *content_id;
- axis2c_om_attribute_t *attribute;
+typedef struct axis2c_om_text_t {
+ char *value;
+ // mtom stuff should go here
+ char *mime_type;
+ int optimize;
+ int is_binary;
+ char *content_id;
+ axis2c_om_attribute_t *attribute;
-};
+} axis2c_om_text_t;
axis2c_node_t *axis2c_create_om_text(const char *value);
-char* axis2c_om_text_get_text(om_text_t *textnode);
-axis2c_node_t *axis2c_create_om_text_with_parent(axis2c_node_t *parent,const char *value);
+char *axis2c_om_text_get_text(axis2c_om_text_t * textnode);
+axis2c_node_t *axis2c_create_om_text_with_parent(axis2c_node_t * parent,
+ const char *value);
@@ -41,6 +41,4 @@
-#endif // AXIS2C_OM_TEXT_H
-
-
+#endif // AXIS2C_OM_TEXT_H
Modified: webservices/axis2/trunk/c/include/axis2c_qname.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_qname.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_qname.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_qname.h Tue Sep 27 17:49:20 2005
@@ -17,17 +17,19 @@
#ifndef _AXISC_QNAME_H_
#define _AXISC_QNAME_H_
-static const char XML_NAMESPACE_URI[] ="http://www.w3c.org/XML/1998/namespace";
+static const char XML_NAMESPACE_URI[] =
+ "http://www.w3c.org/XML/1998/namespace";
-typedef struct axis2c_qname_t{
- char *localpart;
- char *ns_uri;
- char *prefix;
-
-}axis2c_qname_t;
+typedef struct axis2c_qname_t {
+ char *localpart;
+ char *ns_uri;
+ char *prefix;
-axis2c_qname_t *axis2c_create_qname(const char *localname,const char *ns_uri,const char *prefix);
-void axis2c_free_qname(axis2c_qname_t *qn);
+} axis2c_qname_t;
-#endif // _AXISC_QNAME_H_
+axis2c_qname_t *axis2c_create_qname(const char *localname,
+ const char *ns_uri,
+ const char *prefix);
+void axis2c_free_qname(axis2c_qname_t * qn);
+#endif // _AXISC_QNAME_H_
Modified: webservices/axis2/trunk/c/include/axis2c_stax_ombuilder.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2c_stax_ombuilder.h?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2c_stax_ombuilder.h (original)
+++ webservices/axis2/trunk/c/include/axis2c_stax_ombuilder.h Tue Sep 27 17:49:20 2005
@@ -34,5 +34,4 @@
-#endif // _AXISC_STAX_OMBUILDER_H_
-
+#endif // _AXISC_STAX_OMBUILDER_H_
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_document.c?rev=292077&r1=292076&r2=292077&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2c_om_document.c Tue Sep 27 17:49:20 2005
@@ -60,7 +60,7 @@
}
-axis2c_axis2c_node_t *axis2c_om_document_get_document_element(axis2c_om_document_t * document)
+axis2c_node_t *axis2c_om_document_get_document_element(axis2c_om_document_t * document)
{
//while(document->root_element == NULL)
//{}
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=292077&r1=292076&r2=292077&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 17:49:20 2005
@@ -24,8 +24,8 @@
axis2c_node_t *node = axis2c_create_node();
if (node)
{
- om_element_t *element =
- (om_element_t *) malloc(sizeof(om_element_t));
+ axis2c_om_element_t *element =
+ (axis2c_om_element_t *) malloc(sizeof(axis2c_om_element_t));
if (element)
{
element->localname = strdup(localname);
@@ -71,7 +71,7 @@
}
// create an om_element using qname and parent
-axis2c_node_t *axis2c_create_om_element_with_qname_parent(qname_t * qname,
+axis2c_node_t *axis2c_create_om_element_with_qname_parent(axis2c_qname_t * qname,
axis2c_node_t * parent)
{
axis2c_node_t *node = NULL;;
@@ -85,14 +85,14 @@
parent);
if (node)
{
- ((om_element_t *) (node->data_element))->ns =
+ ((axis2c_om_element_t *) (node->data_element))->ns =
axis2c_om_element_handle_namespace_with_qname(node, qname);
}
return node;
}
-axis2c_om_namespace_t *axis2c_om_element_find_namespace(node_t * element_node,
+axis2c_om_namespace_t *axis2c_om_element_find_namespace(axis2c_om_element_t* element_node,
const char *uri,
const char *prefix)
{
@@ -130,17 +130,17 @@
// declare a namespace for this om element
-axis2c_om_namespace_t *axis2c_om_element_declare_namespace(node_t * element_node,
+axis2c_om_namespace_t *axis2c_om_element_declare_namespace(axis2c_om_element_t* element_node,
axis2c_om_namespace_t * ns)
{
apr_status_t status;
- om_element_t *element = NULL;
+ axis2c_om_element_t *element = NULL;
if (!element_node || !ns || !element_node->data_element
|| element_node->element_type != OM_ELEMENT)
{
return NULL;
}
- element = (om_element_t *) (element_node->data_element);
+ element = (axis2c_om_element_t *) (element_node->data_element);
if (!element->namespaces)
{
if (!om_pool)
@@ -156,7 +156,7 @@
axis2c_om_namespace_t
- *axis2c_om_element_declare_namespace_with_ns_uri_prefix(node_t *
+ *axis2c_om_element_declare_namespace_with_ns_uri_prefix(axis2c_node_t *
element_node,
const char
*uri,
@@ -175,19 +175,19 @@
* can be used to retrive a prefix of a known namespace uri
*
*/
-axis2c_om_namespace_t *axis2c_om_element_find_declared_namespace(node_t *
+axis2c_om_namespace_t *axis2c_om_element_find_declared_namespace(axis2c_node_t *
element_node,
const char *uri,
const char
*prefix)
{
void *ns = NULL;
- om_element_t *element = NULL;
+ axis2c_om_element_t *element = NULL;
if (!element_node || !ns || element_node->element_type != OM_ELEMENT)
{
return NULL;
}
- element = (om_element_t *) (element_node->data_element);
+ element = (axis2c_om_element_t *) (element_node->data_element);
if (!prefix || strcmp(prefix, "") == 0)
{
// should traverse through the namespaces
@@ -206,10 +206,10 @@
-static axis2c_om_namespace_t *axis2c_om_element_handle_namespace_with_qname(node_t
+static axis2c_om_namespace_t *axis2c_om_element_handle_namespace_with_qname(axis2c_node_t
*
element_node,
- qname_t
+ axis2c_qname_t
*
qname)
{
@@ -244,7 +244,7 @@
-static axis2c_om_namespace_t *axis2c_om_element_handle_namespace(node_t *
+static axis2c_om_namespace_t *axis2c_om_element_handle_namespace(axis2c_node_t *
element_node,
axis2c_om_namespace_t *
ns)
@@ -267,12 +267,12 @@
}
-om_attribute_t *axis2c_om_element_add_attribute(node_t * element_node,
- om_attribute_t * attr)
+axis2c_om_attribute_t *axis2c_om_element_add_attribute(axis2c_node_t * element_node,
+ axis2c_om_attribute_t * attr)
{
apr_status_t status;
- qname_t *t = NULL;
- om_element_t *element = NULL;
+ axis2c_qname_t *t = NULL;
+ axis2c_om_element_t *element = NULL;
char *key = NULL;
if (!element_node || element_node->element_type != OM_ELEMENT)
@@ -280,7 +280,7 @@
//fprintf(stderr,"Error");
return NULL;
}
- element = (om_element_t *) (element_node->data_element);
+ element = (axis2c_om_element_t *) (element_node->data_element);
if (!(element->attributes))
{
@@ -298,19 +298,19 @@
return attr;
}
-om_attribute_t *axis2c_om_element_get_attribute(node_t * element_node,
- qname_t * qname)
+axis2c_om_attribute_t *axis2c_om_element_get_attribute(axis2c_node_t * element_node,
+ axis2c_qname_t * qname)
{
char *key = NULL;
- om_element_t *element = NULL;
+ axis2c_om_element_t *element = NULL;
if (!element_node || !qname
|| element_node->element_type != OM_ELEMENT)
{
return NULL;
}
- element = (om_element_t *) (element_node->data_element);
+ element = (axis2c_om_element_t *) (element_node->data_element);
key = axis2c_construct_key_from_qname(qname);
- return (om_attribute_t
+ return (axis2c_om_attribute_t
*) (apr_hash_get(element->attributes, key,
APR_HASH_KEY_STRING));
}
@@ -318,7 +318,7 @@
-static char *axis2c_construct_key_from_qname(qname_t * qname)
+static char *axis2c_construct_key_from_qname(axis2c_qname_t * qname)
{
// concatanation order is localpart prefix namespaceuri
@@ -357,7 +357,7 @@
*
*/
-om_attribute_t *axis2c_om_attribute_add_attribute_with_namespace(node_t *
+axis2c_om_attribute_t *axis2c_om_attribute_add_attribute_with_namespace(axis2c_node_t *
element_node,
const char
*attribute_name,
@@ -421,18 +421,18 @@
}
*/
-void axis2c_om_element_set_namespace(node_t * node, axis2c_om_namespace_t * ns)
+void axis2c_om_element_set_namespace(axis2c_node_t * node, axis2c_om_namespace_t * ns)
{
axis2c_om_namespace_t *nsp = NULL;
if (ns && node && (node->data_element))
{
nsp = axis2c_om_element_handle_namespace(node, ns);
}
- ((om_element_t *) node->data_element)->ns = nsp;
+ ((axis2c_om_element_t *) node->data_element)->ns = nsp;
}
-void axis2c_free_om_element(om_element_t * element)
+void axis2c_free_om_element(axis2c_om_element_t * element)
{
if (element)
{
@@ -454,16 +454,16 @@
}
}
-void axis2c_om_element_set_localname(node_t * element_node,
+void axis2c_om_element_set_localname(axis2c_node_t * element_node,
const char *localname)
{
- om_element_t *element = NULL;
+ axis2c_om_element_t *element = NULL;
if (!element_node || element_node->element_type != OM_ELEMENT)
{
// not correct element or null pointer
return;
}
- element = (om_element_t *) (element_node->data_element);
+ element = (axis2c_om_element_t *) (element_node->data_element);
if (element->localname)
{
free(element->localname);
@@ -471,12 +471,12 @@
element->localname = strdup(localname);
}
-char *axis2c_om_element_get_localname(node_t * element_node)
+char *axis2c_om_element_get_localname(axis2c_node_t * element_node)
{
if (!element_node || element_node->element_type != OM_ELEMENT)
{
return NULL;
}
- return strdup(((om_element_t *) (element_node->data_element))->
+ return strdup(((axis2c_om_element_t *) (element_node->data_element))->
localname);
}