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/15 11:58:32 UTC
svn commit: r518579 - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/om/ axiom/src/soap/ axiom/src/util/ axiom/test/om/
axiom/test/soap/ modules/core/engine/ modules/mod_addr/
rampart/src/omxmlsec/c14n/ rampart/src/util/ woden/src/builder/ wod...
Author: dushshantha
Date: Thu Mar 15 03:58:27 2007
New Revision: 518579
URL: http://svn.apache.org/viewvc?view=rev&rev=518579
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_namespace.h
webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h
webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/axiom/test/om/test_om.c
webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_namespace.h?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_namespace.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_namespace.h Thu Mar 15 03:58:27 2007
@@ -18,12 +18,6 @@
#ifndef AXIOM_NAMESPACE_H
#define AXIOM_NAMESPACE_H
-/**
- * @file axiom_namespace.h
- * @brief defines axiom_namespace data structure,
- * used for representing XML namespaces in OM
- */
-
#include <axis2_utils_defines.h>
#include <axis2_env.h>
#include <axiom_output.h>
@@ -47,10 +41,11 @@
* @param prefix namespace prefix
* @return a pointer to newly created namespace struct
*/
- AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
+ AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
axiom_namespace_create(const axis2_env_t *env,
- const axis2_char_t * uri,
- const axis2_char_t *prefix);
+ const axis2_char_t * uri,
+ const axis2_char_t *prefix);
+
/**
* Frees given AXIOM namespcae
* @param om_namespace namespace to be freed.
@@ -59,7 +54,7 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_free(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
* Compares two namepsaces
@@ -70,8 +65,8 @@
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_namespace_equals(struct axiom_namespace *om_namespace,
- const axis2_env_t *env,
- struct axiom_namespace *om_namespace1);
+ const axis2_env_t *env,
+ struct axiom_namespace *om_namespace1);
/**
* Serializes given namespace
@@ -82,75 +77,52 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_serialize(struct axiom_namespace *om_namespace,
- const axis2_env_t *env,
- axiom_output_t * om_output);
+ const axis2_env_t *env,
+ axiom_output_t * om_output);
+
/**
- *@param om_namespace pointer to om_namespace struct
- *@param env environment , MUST NOT be NULL.
- *@returns namespace uri , NULL on error
- */
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ * @param om_namespace pointer to om_namespace struct
+ * @param env environment , MUST NOT be NULL.
+ * @returns namespace uri , NULL on error
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_get_uri(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
+ const axis2_env_t *env);
+
/**
- *@param om_namespace pointer to om namespace struct
- *@param env environment, MUST NOT be NULL
- *@return prefix , NULL on error
- */
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ * @param om_namespace pointer to om namespace struct
+ * @param env environment, MUST NOT be NULL
+ * @return prefix , NULL on error
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_get_prefix(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
-
+ const axis2_env_t *env);
/**
- * clones an om_namespace struct
- * @param om_namespace pointer to namespace struct
- * @param env environment
- * @returns axiom_namespace on success , NULL on error
- */
- AXIS2_EXTERN struct axiom_namespace* AXIS2_CALL
- axiom_namespace_clone(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
+ * Clones an om_namespace struct
+ * @param om_namespace pointer to namespace struct
+ * @param env environment
+ * @returns axiom_namespace on success , NULL on error
+ */
+ AXIS2_EXTERN struct axiom_namespace *AXIS2_CALL
+ axiom_namespace_clone(struct axiom_namespace *om_namespace,
+ const axis2_env_t *env);
/**
- * to string , returns the string by combining namespace_uri,
- * and prefix seperated by a '|' character
- * @param om_namespace
- * @param env environment
- * @returns pointer to string , This is a property of namespace,
- * should not be freed by user
- */
- AXIS2_EXTERN axis2_char_t * AXIS2_CALL
+ * to string , returns the string by combining namespace_uri,
+ * and prefix seperated by a '|' character
+ * @param om_namespace
+ * @param env environment
+ * @returns pointer to string , This is a property of namespace,
+ * should not be freed by user
+ */
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_to_string(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
+ const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_increment_ref(struct axiom_namespace *om_namespace,
- const axis2_env_t *env);
-
- /** frees given namespace */
-#define AXIOM_NAMESPACE_FREE(om_namespace,env) \
- axiom_namespace_free(om_namespace, env)
-
- /** compares the given two namespaces for equality */
-#define AXIOM_NAMESPACE_EQUALS(om_namespace, env, om_namespace1) \
- axiom_namespace_equals(om_namespace, env, om_namespace1)
-
- /** serializes given namespace */
-#define AXIOM_NAMESPACE_SERIALIZE(om_namespace,env, om_output) \
- axiom_namespace_serialize(om_namespace, env,om_output)
- /** get prefix */
-#define AXIOM_NAMESPACE_GET_PREFIX(om_namespace, env) \
- axiom_namespace_get_prefix(om_namespace, env)
- /** get namespace uri */
-#define AXIOM_NAMESPACE_GET_URI(om_namespace, env) \
- axiom_namespace_get_uri(om_namespace, env)
- /** clones a namespace */
-#define AXIOM_NAMESPACE_CLONE(om_namespace, env) \
- axiom_namespace_clone(om_namespace, env)
- /** returns a string from namespace */
-#define AXIOM_NAMESPACE_TO_STRING(om_namespace, env) \
- axiom_namespace_to_string(om_namespace, env)
+ const axis2_env_t *env);
/** @} */
Modified: webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h (original)
+++ webservices/axis2/trunk/c/axiom/src/om/axiom_namespace_internal.h Thu Mar 15 03:58:27 2007
@@ -32,12 +32,12 @@
extern "C"
{
#endif
-
+
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_set_uri(axiom_namespace_t *ns,
- const axis2_env_t *env,
- const axis2_char_t *ns_uri);
-
+ const axis2_env_t *env,
+ const axis2_char_t *ns_uri);
+
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Thu Mar 15 03:58:27 2007
@@ -135,8 +135,8 @@
{
qname = axis2_qname_create(env,
attribute->localname,
- AXIOM_NAMESPACE_GET_URI(attribute->ns, env),
- AXIOM_NAMESPACE_GET_PREFIX(attribute->ns, env));
+ axiom_namespace_get_uri(attribute->ns, env),
+ axiom_namespace_get_prefix(attribute->ns, env));
}
else
{
@@ -164,8 +164,8 @@
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
- uri = AXIOM_NAMESPACE_GET_URI(attribute->ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(attribute->ns, env);
+ uri = axiom_namespace_get_uri(attribute->ns, env);
+ prefix = axiom_namespace_get_prefix(attribute->ns, env);
if ((uri) && (NULL != prefix) && (AXIS2_STRCMP(prefix, "") != 0))
{
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Thu Mar 15 03:58:27 2007
@@ -113,8 +113,8 @@
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
- uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, env);
+ uri = axiom_namespace_get_uri(ns, env);
+ prefix = axiom_namespace_get_prefix(ns, env);
element->ns = axiom_element_find_namespace(element,
env, *node, uri, prefix);
@@ -193,7 +193,7 @@
}
else
{
- AXIOM_NAMESPACE_FREE(ns, env);
+ axiom_namespace_free(ns, env);
AXIOM_ELEMENT_FREE(om_element, env);
AXIS2_FREE(env->allocator, *node);
return NULL;
@@ -242,7 +242,7 @@
if (default_ns && NULL != uri)
{
axis2_char_t *default_uri = NULL;
- default_uri = AXIOM_NAMESPACE_GET_URI(default_ns, env);
+ default_uri = axiom_namespace_get_uri(default_ns, env);
if (default_uri && AXIS2_STRCMP(uri, default_uri) == 0)
{
@@ -259,7 +259,7 @@
axiom_namespace_t *temp_ns = NULL;
axis2_char_t *temp_nsuri = NULL;
temp_ns = (axiom_namespace_t *)ns;
- temp_nsuri = AXIOM_NAMESPACE_GET_URI(temp_ns, env);
+ temp_nsuri = axiom_namespace_get_uri(temp_ns, env);
if (temp_nsuri && (AXIS2_STRCMP(temp_nsuri, uri) == 0))
{
@@ -285,7 +285,7 @@
axis2_char_t *found_uri = NULL;
found_ns = (axiom_namespace_t*)ns;
- found_uri = AXIOM_NAMESPACE_GET_URI(found_ns, env);
+ found_uri = axiom_namespace_get_uri(found_ns, env);
/* TODO fix this
if( ( found_uri) && AXIS2_STRCMP(found_uri, uri) == 0)
@@ -337,8 +337,8 @@
return AXIS2_FAILURE;
}
- uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, env);
+ uri = axiom_namespace_get_uri(ns, env);
+ prefix = axiom_namespace_get_prefix(ns, env);
if (!(om_element->namespaces))
{
@@ -386,15 +386,15 @@
return AXIS2_FAILURE;
}
- uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, env);
+ uri = axiom_namespace_get_uri(ns, env);
+ prefix = axiom_namespace_get_prefix(ns, env);
declared_ns = axiom_element_find_namespace(om_element,
env, node, uri, prefix);
if (declared_ns)
{
- if (AXIOM_NAMESPACE_EQUALS(ns, env, declared_ns) == AXIS2_TRUE)
+ if (axiom_namespace_equals(ns, env, declared_ns) == AXIS2_TRUE)
{/*Namespace already declared, so return */
return AXIS2_SUCCESS;
}
@@ -454,7 +454,7 @@
axiom_namespace_t *temp_ns = NULL;
axis2_char_t *temp_nsuri = NULL;
temp_ns = (axiom_namespace_t *)(ns);
- temp_nsuri = AXIOM_NAMESPACE_GET_URI(temp_ns, env);
+ temp_nsuri = axiom_namespace_get_uri(temp_ns, env);
if (temp_nsuri && AXIS2_STRCMP(temp_nsuri, uri) == 0)
{
@@ -476,7 +476,7 @@
{
axis2_char_t *found_uri = NULL;
found_ns = (axiom_namespace_t *) ns;
- found_uri = AXIOM_NAMESPACE_GET_URI(found_ns, env);
+ found_uri = axiom_namespace_get_uri(found_ns, env);
if (found_uri && AXIS2_STRCMP(found_uri, uri) == 0)
{
return found_ns;
@@ -533,8 +533,8 @@
temp_ns = AXIOM_ELEMENT_FIND_NAMESPACE
(om_element, env,
element_node,
- AXIOM_NAMESPACE_GET_URI(om_namespace, env),
- AXIOM_NAMESPACE_GET_PREFIX(om_namespace, env));
+ axiom_namespace_get_uri(om_namespace, env),
+ axiom_namespace_get_prefix(om_namespace, env));
if (!temp_ns)
{
axis2_status_t status = AXIS2_SUCCESS;
@@ -631,7 +631,7 @@
axis2_hash_this(hi, NULL, NULL, &val);
if (val)
{
- AXIOM_NAMESPACE_FREE((axiom_namespace_t *)val, env);
+ axiom_namespace_free((axiom_namespace_t *)val, env);
val = NULL;
}
}
@@ -685,8 +685,8 @@
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
- uri = AXIOM_NAMESPACE_GET_URI(om_element->ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(om_element->ns, env);
+ uri = axiom_namespace_get_uri(om_element->ns, env);
+ prefix = axiom_namespace_get_prefix(om_element->ns, env);
if ((uri) && (NULL != prefix) && (AXIS2_STRCMP(prefix, "") != 0))
{
@@ -739,7 +739,7 @@
if (val)
status =
- AXIOM_NAMESPACE_SERIALIZE((axiom_namespace_t *)val,
+ axiom_namespace_serialize((axiom_namespace_t *)val,
env, om_output);
else
{
@@ -825,8 +825,8 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, ns , AXIS2_FAILURE);
om_ns = axiom_element_find_namespace(om_element, env, node,
- AXIOM_NAMESPACE_GET_URI(ns, env),
- AXIOM_NAMESPACE_GET_PREFIX(ns , env));
+ axiom_namespace_get_uri(ns, env),
+ axiom_namespace_get_prefix(ns , env));
if (!om_ns)
{
status = axiom_element_declare_namespace(om_element, env, node, ns);
@@ -886,18 +886,18 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_element, env, ele_node);
if (ns)
{
- if (AXIOM_NAMESPACE_GET_PREFIX(ns, env))
+ if (axiom_namespace_get_prefix(ns, env))
{
om_element->qname = axis2_qname_create(env ,
om_element->localname,
- AXIOM_NAMESPACE_GET_URI(ns, env),
- AXIOM_NAMESPACE_GET_PREFIX(ns, env));
+ axiom_namespace_get_uri(ns, env),
+ axiom_namespace_get_prefix(ns, env));
}
else
{
om_element->qname = axis2_qname_create(env,
om_element->localname,
- AXIOM_NAMESPACE_GET_URI(ns, env),
+ axiom_namespace_get_uri(ns, env),
NULL);
}
@@ -1407,7 +1407,7 @@
om_ns = axiom_attribute_get_namespace(om_attr, env);
if (om_ns)
{
- cloned_ns = AXIOM_NAMESPACE_CLONE(om_ns, env);
+ cloned_ns = axiom_namespace_clone(om_ns, env);
axiom_attribute_set_namespace(cloned_attr, env, cloned_ns);
}
qn = axiom_attribute_get_qname(cloned_attr, env);
@@ -1456,7 +1456,7 @@
attr_ns = axiom_attribute_get_namespace(om_attr, env);
if (attr_ns)
{
- prefix = AXIOM_NAMESPACE_GET_PREFIX(attr_ns, env);
+ prefix = axiom_namespace_get_prefix(attr_ns, env);
if (prefix)
{
axis2_char_t *tmp_val = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Thu Mar 15 03:58:27 2007
@@ -31,40 +31,27 @@
int ref;
};
-AXIS2_EXTERN axiom_namespace_t * AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
axiom_namespace_create(const axis2_env_t *env,
- const axis2_char_t * uri,
- const axis2_char_t * prefix)
+ const axis2_char_t * uri,
+ const axis2_char_t * prefix)
{
axiom_namespace_t *om_namespace = NULL;
AXIS2_ENV_CHECK(env, NULL);
- /* There should be a uri */
- /* if (!uri) */
- /* { */
- /* AXIS2_ERROR_SET(env->error, */
- /* AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE); */
- /* return NULL; */
- /* } */
- /* if (AXIS2_STRCMP(uri, "") == 0) */
- /* { */
- /* AXIS2_ERROR_SET(env->error, */
- /* AXIS2_ERROR_INVALID_EMPTY_NAMESPACE_URI, AXIS2_FAILURE); */
- /* return NULL; */
- /* } */
-
if (!uri)
+ {
uri = "";
+ }
om_namespace = (axiom_namespace_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_namespace_t));
+ sizeof(axiom_namespace_t));
if (!om_namespace)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY , AXIS2_FAILURE);
return NULL;
}
-
om_namespace->ref = 0;
om_namespace->prefix = NULL;
om_namespace->uri = NULL;
@@ -93,11 +80,9 @@
return om_namespace ;
}
-
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_free(axiom_namespace_t *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -109,19 +94,16 @@
if (om_namespace->prefix)
{
AXIS2_FREE(env->allocator, om_namespace->prefix);
- om_namespace->prefix = NULL;
}
if (om_namespace->uri)
{
AXIS2_FREE(env->allocator, om_namespace->uri);
- om_namespace->uri = NULL;
}
if (om_namespace->key)
{
AXIS2_FREE(env->allocator, om_namespace->key);
- om_namespace->key = NULL;
}
AXIS2_FREE(env->allocator, om_namespace);
@@ -131,8 +113,8 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axiom_namespace_equals(axiom_namespace_t *om_namespace,
- const axis2_env_t *env,
- axiom_namespace_t *om_namespace1)
+ const axis2_env_t *env,
+ axiom_namespace_t *om_namespace1)
{
int uris_differ = 0;
int prefixes_differ = 0;
@@ -142,76 +124,86 @@
AXIS2_PARAM_CHECK(env->error, om_namespace1, AXIS2_FAILURE);
if (!om_namespace || !om_namespace1)
+ {
return AXIS2_FALSE;
+ }
if (om_namespace->uri && om_namespace1->uri)
+ {
uris_differ = axis2_strcmp(om_namespace->uri, om_namespace1->uri);
+ }
else
+ {
uris_differ = (om_namespace->uri || om_namespace1->uri);
+ }
if (om_namespace->prefix && om_namespace1->prefix)
+ {
prefixes_differ =
axis2_strcmp(om_namespace->prefix, om_namespace1->prefix);
+ }
else
+ {
prefixes_differ = (om_namespace->prefix || om_namespace1->prefix);
+ }
return (!uris_differ && !prefixes_differ);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_serialize(axiom_namespace_t *om_namespace,
- const axis2_env_t *env,
- axiom_output_t *om_output)
+ const axis2_env_t *env,
+ axiom_output_t *om_output)
{
int status = AXIS2_SUCCESS;
if (!om_namespace)
+ {
return AXIS2_FAILURE;
+ }
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
if (om_namespace->uri && NULL != om_namespace->prefix &&
- AXIS2_STRCMP(om_namespace->prefix, "") != 0)
+ AXIS2_STRCMP(om_namespace->prefix, "") != 0)
{
status = axiom_output_write(om_output, env, AXIOM_NAMESPACE,
- 2, om_namespace->prefix,
- om_namespace->uri);
+ 2, om_namespace->prefix,
+ om_namespace->uri);
}
else if (om_namespace->uri)
{
status = axiom_output_write(om_output, env, AXIOM_NAMESPACE,
- 2, NULL, om_namespace->uri);
+ 2, NULL, om_namespace->uri);
}
return status;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_get_uri(axiom_namespace_t *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return om_namespace->uri;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_get_prefix(axiom_namespace_t *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return om_namespace->prefix;
}
-AXIS2_EXTERN axiom_namespace_t* AXIS2_CALL
+AXIS2_EXTERN axiom_namespace_t *AXIS2_CALL
axiom_namespace_clone(axiom_namespace_t *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axiom_namespace_t *cloned_ns = NULL;
AXIS2_ENV_CHECK(env, NULL);
cloned_ns = axiom_namespace_create(env,
- om_namespace->uri, om_namespace->prefix);
+ om_namespace->uri, om_namespace->prefix);
if (cloned_ns)
{
return cloned_ns;
@@ -219,9 +211,9 @@
return NULL;
}
-AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_namespace_to_string(axiom_namespace_t *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_char_t *temp_str = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -243,7 +235,7 @@
else if ((om_namespace->uri) && !(om_namespace->prefix))
{
om_namespace->key = AXIS2_STRDUP(om_namespace->uri, env);
- if (NULL == om_namespace->key)
+ if (!(om_namespace->key))
{
return NULL;
}
@@ -254,8 +246,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_set_uri(axiom_namespace_t *om_namespace,
- const axis2_env_t *env,
- const axis2_char_t *uri)
+ const axis2_env_t *env,
+ const axis2_char_t *uri)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
@@ -271,19 +263,16 @@
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
-
}
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_namespace_increment_ref(struct axiom_namespace *om_namespace,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
om_namespace->ref++;
-
return AXIS2_SUCCESS;
}
+
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Thu Mar 15 03:58:27 2007
@@ -316,7 +316,7 @@
if (!status)
{
- AXIOM_NAMESPACE_FREE(om_ns, env);
+ axiom_namespace_free(om_ns, env);
om_ns = NULL;
}
}
@@ -334,7 +334,7 @@
status = axiom_element_declare_namespace_assume_param_ownership(om_ele,
env, om_ns);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(om_ns, env);
+ prefix = axiom_namespace_get_prefix(om_ns, env);
axis2_hash_set(om_builder->declared_namespaces,
prefix, AXIS2_HASH_KEY_STRING, om_ns);
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Thu Mar 15 03:58:27 2007
@@ -145,7 +145,7 @@
if (om_text->ns)
{
- AXIOM_NAMESPACE_FREE(om_text->ns, env);
+ axiom_namespace_free(om_text->ns, env);
}
if (om_text->content_id)
@@ -367,10 +367,10 @@
if (om_text->ns)
{
- namespace_uri = AXIOM_NAMESPACE_GET_URI(om_text->ns, env);
+ namespace_uri = axiom_namespace_get_uri(om_text->ns, env);
if (namespace_uri)
{
- prefix = AXIOM_NAMESPACE_GET_PREFIX(om_text->ns, env);
+ prefix = axiom_namespace_get_prefix(om_text->ns, env);
if (prefix)
{
@@ -400,7 +400,7 @@
}
if (om_text->ns)
{
- AXIOM_NAMESPACE_SERIALIZE(om_text->ns, env, om_output);
+ axiom_namespace_serialize(om_text->ns, env, om_output);
}
return AXIS2_SUCCESS;
@@ -426,12 +426,12 @@
AXIS2_XML_PARSER_TYPE_BUFFER);
om_namespace = axiom_namespace_create(env, "" , "");
- namespace_uri = AXIOM_NAMESPACE_GET_URI(om_text->ns, env);
+ namespace_uri = axiom_namespace_get_uri(om_text->ns, env);
attribute_local_name = axiom_attribute_get_localname(om_attribute, env);
if (om_namespace)
{
- prefix = AXIOM_NAMESPACE_GET_PREFIX(om_text->ns, env);
+ prefix = axiom_namespace_get_prefix(om_text->ns, env);
attribute_value = axiom_attribute_get_value(om_attribute, env);
if (prefix)
{
@@ -447,7 +447,7 @@
{
AXIOM_XML_WRITER_WRITE_ATTRIBUTE(xml_writer, env, attribute_local_name, attribute_value);
}
- AXIOM_NAMESPACE_FREE(om_namespace, env);
+ axiom_namespace_free(om_namespace, env);
return AXIS2_SUCCESS;
}
@@ -469,8 +469,8 @@
if (om_namespace)
{
- namespace_uri = AXIOM_NAMESPACE_GET_URI(om_text->ns, env);
- namespace_prefix = AXIOM_NAMESPACE_GET_PREFIX(om_text->ns, env);
+ namespace_uri = axiom_namespace_get_uri(om_text->ns, env);
+ namespace_prefix = axiom_namespace_get_prefix(om_text->ns, env);
AXIOM_XML_WRITER_WRITE_NAMESPACE(xml_writer, env, namespace_prefix, namespace_uri);
AXIOM_XML_WRITER_SET_PREFIX(xml_writer, env, namespace_prefix, namespace_uri);
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_body.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_body.c Thu Mar 15 03:58:27 2007
@@ -302,7 +302,7 @@
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(body_ele, env, soap_body->om_ele_node);
if (!om_ns)
return AXIS2_FAILURE;
- uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
+ uri = axiom_namespace_get_uri(om_ns, env);
if (uri)
{
if (AXIS2_STRCMP(uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Thu Mar 15 03:58:27 2007
@@ -397,7 +397,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_element, env, om_element_node);
if (ns)
{
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ axis2_char_t *uri = axiom_namespace_get_uri(ns, env);
if (uri)
{
if (AXIS2_STRCMP(uri, AXIS2_XOP_NAMESPACE_URI) == 0)
@@ -599,14 +599,14 @@
soap_builder->processing_mandatory_fault_elements = AXIS2_TRUE;
if (AXIS2_STRCMP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
- AXIOM_NAMESPACE_GET_URI(env_ns , env)) == 0)
+ axiom_namespace_get_uri(env_ns , env)) == 0)
{
soap_builder->builder_helper = axiom_soap12_builder_helper_create(env, soap_builder);
if (!(soap_builder->builder_helper))
return AXIS2_FAILURE;
}
else if (AXIS2_STRCMP(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
- AXIOM_NAMESPACE_GET_URI(env_ns , env)) == 0)
+ axiom_namespace_get_uri(env_ns , env)) == 0)
{
soap_builder->builder_helper = axiom_soap11_builder_helper_create(env, soap_builder, soap_builder->om_builder);
if (!(soap_builder->builder_helper))
@@ -661,7 +661,7 @@
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
if (om_ns)
{
- ns_uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
+ ns_uri = axiom_namespace_get_uri(om_ns, env);
if (ns_uri &&
(AXIS2_STRCMP(ns_uri, AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) != 0) &&
(AXIS2_STRCMP(ns_uri, AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI) != 0))
@@ -715,7 +715,7 @@
if (!om_ns)
return AXIS2_FAILURE;
- ns_uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
+ ns_uri = axiom_namespace_get_uri(om_ns, env);
if (ns_uri)
{
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Thu Mar 15 03:58:27 2007
@@ -664,7 +664,7 @@
if (!ns)
return AXIS2_FAILURE;
- uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ uri = axiom_namespace_get_uri(ns, env);
if (!uri)
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Thu Mar 15 03:58:27 2007
@@ -132,7 +132,7 @@
if (fault_text->lang_ns_used == AXIS2_FALSE && fault_text->lang_namespace)
{
- AXIOM_NAMESPACE_FREE(fault_text->lang_namespace, env);
+ axiom_namespace_free(fault_text->lang_namespace, env);
fault_text->lang_namespace = NULL;
}
AXIS2_FREE(env->allocator, fault_text);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Thu Mar 15 03:58:27 2007
@@ -207,7 +207,7 @@
AXIS2_PARAM_CHECK(env->error, localname, NULL);
AXIS2_PARAM_CHECK(env->error, ns, NULL);
- cloned_ns = AXIOM_NAMESPACE_CLONE(ns, env);
+ cloned_ns = axiom_namespace_clone(ns, env);
if (!cloned_ns)
return NULL;
@@ -232,14 +232,14 @@
if (hb_ele)
{
axiom_namespace_t *dec_ns = NULL;
- uri = AXIOM_NAMESPACE_GET_URI(cloned_ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(cloned_ns, env);
+ uri = axiom_namespace_get_uri(cloned_ns, env);
+ prefix = axiom_namespace_get_prefix(cloned_ns, env);
dec_ns = AXIOM_ELEMENT_FIND_DECLARED_NAMESPACE(hb_ele, env, uri, prefix);
if (!dec_ns)
{
/** this namespace it not in hb_ele list so free it */
- AXIOM_NAMESPACE_FREE(cloned_ns, env);
+ axiom_namespace_free(cloned_ns, env);
cloned_ns = NULL;
}
@@ -486,7 +486,7 @@
header_block_om_node);
if (ns)
{
- hb_namespace_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ hb_namespace_uri = axiom_namespace_get_uri(ns, env);
if (AXIS2_STRCMP(hb_namespace_uri, ns_uri) == 0)
{
axis2_array_list_add(header_block_list, env, header_block);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Thu Mar 15 03:58:27 2007
@@ -302,7 +302,7 @@
header_ns = AXIOM_ELEMENT_GET_NAMESPACE(header_ele, env, header_node);
if (!header_ns)
return AXIS2_FAILURE;
- prefix = AXIOM_NAMESPACE_GET_PREFIX(header_ns, env);
+ prefix = axiom_namespace_get_prefix(header_ns, env);
}
qn = axis2_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
@@ -334,7 +334,7 @@
om_attr = axiom_attribute_create(env, attr_name, attr_value, om_ns);
if (!om_attr && om_ns)
{
- AXIOM_NAMESPACE_FREE(om_ns, env);
+ axiom_namespace_free(om_ns, env);
return AXIS2_FAILURE;
}
@@ -378,7 +378,7 @@
header_ns = AXIOM_ELEMENT_GET_NAMESPACE(header_ele, env, header_node);
if (!header_ns)
return NULL;
- prefix = AXIOM_NAMESPACE_GET_PREFIX(header_ns, env);
+ prefix = axiom_namespace_get_prefix(header_ns, env);
}
qn = axis2_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
if (!qn)
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Thu Mar 15 03:58:27 2007
@@ -51,7 +51,7 @@
if (ns)
{
axis2_char_t *child_uri = NULL;
- child_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ child_uri = axiom_namespace_get_uri(ns, env);
if (child_uri && AXIS2_STRCMP(child_uri, uri) == 0)
{
(*child) = child_node;
@@ -92,7 +92,7 @@
if (ns)
{
axis2_char_t *sib_uri = NULL;
- sib_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ sib_uri = axiom_namespace_get_uri(ns, env);
if (sib_uri && AXIS2_STRCMP(sib_uri, uri) == 0)
{
(*next_node) = next_sib_node;
@@ -340,7 +340,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, child);
if (ns)
{
- ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ ns_uri = axiom_namespace_get_uri(ns, env);
}
if ((child_localname) &&
@@ -369,7 +369,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
if (ns)
{
- ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ ns_uri = axiom_namespace_get_uri(ns, env);
}
if ((child_localname) &&
@@ -420,7 +420,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, ele_node);
if (ns)
{
- ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ ns_uri = axiom_namespace_get_uri(ns, env);
}
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
if (child_localname &&
@@ -468,7 +468,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, next_sibling);
if (ns)
{
- ns_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ ns_uri = axiom_namespace_get_uri(ns, env);
}
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
if (ele_localname &&
@@ -1015,7 +1015,7 @@
om_ns = AXIOM_ELEMENT_GET_NAMESPACE(om_ele, env, om_node);
if (om_ns)
{
- return AXIOM_NAMESPACE_GET_URI(om_ns, env);
+ return axiom_namespace_get_uri(om_ns, env);
}
}
return NULL;
Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Thu Mar 15 03:58:27 2007
@@ -127,8 +127,8 @@
if (ns)
{
- printf("root ns prefix %s\n", AXIOM_NAMESPACE_GET_PREFIX(ns, environment));
- printf("root ns uri %s\n", AXIOM_NAMESPACE_GET_URI(ns, environment));
+ printf("root ns prefix %s\n", axiom_namespace_get_prefix(ns, environment));
+ printf("root ns uri %s\n", axiom_namespace_get_uri(ns, environment));
}
}
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Thu Mar 15 03:58:27 2007
@@ -93,8 +93,8 @@
if (om_ns)
{
- prefix = AXIOM_NAMESPACE_GET_PREFIX(om_ns, env);
- uri = AXIOM_NAMESPACE_GET_URI(om_ns, env);
+ prefix = axiom_namespace_get_prefix(om_ns, env);
+ uri = axiom_namespace_get_uri(om_ns, env);
printf("\n uri %s \n prefix %s \n", uri, prefix);
}
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Thu Mar 15 03:58:27 2007
@@ -115,7 +115,7 @@
AXIOM_ELEMENT_GET_NAMESPACE(element, env, body_first_child_node);
if (ns)
{
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ axis2_char_t *uri = axiom_namespace_get_uri(ns, env);
if (uri)
{
axis2_char_t **url_tokens = NULL;
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Thu Mar 15 03:58:27 2007
@@ -203,14 +203,14 @@
soap_envelope = axis2_msg_ctx_get_soap_envelope(msg_ctx, env);
if (!soap_envelope)
{
- AXIOM_NAMESPACE_FREE(addressing_namespace, env);
+ axiom_namespace_free(addressing_namespace, env);
return AXIS2_SUCCESS; /* can happen in case of one way services/clients */
}
soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(soap_envelope, env);
if (!soap_header)
{
- AXIOM_NAMESPACE_FREE(addressing_namespace, env);
+ axiom_namespace_free(addressing_namespace, env);
return AXIS2_SUCCESS; /*No SOAP header, so no point proceeding*/
}
@@ -453,7 +453,7 @@
relates_to_header_node, addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
if (dec_ns)
{
- AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
+ axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL ;
axiom_attribute_set_namespace(om_attr, env, dec_ns);
}
@@ -511,7 +511,7 @@
addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
if (! dec_ns)
{
- AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
+ axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
}
}
@@ -551,7 +551,7 @@
if (addr_ns_obj)
{
- AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
+ axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
}
@@ -579,7 +579,7 @@
addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
if (! dec_ns)
{
- AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
+ axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
}
}
@@ -753,7 +753,7 @@
addr_ns, AXIS2_WSA_DEFAULT_PREFIX);
if (! dec_ns)
{
- AXIOM_NAMESPACE_FREE(addr_ns_obj, env);
+ axiom_namespace_free(addr_ns_obj, env);
addr_ns_obj = NULL;
}
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Thu Mar 15 03:58:27 2007
@@ -212,12 +212,12 @@
{
for (i = ns_stack->head-1; i>=0; i--)
{
- axis2_char_t *prefix_i = AXIOM_NAMESPACE_GET_PREFIX(
+ axis2_char_t *prefix_i = axiom_namespace_get_prefix(
(ns_stack->stack)[i], ctx->env);
if (AXIS2_STRCMP(prefix_i, prefix) == 0)
{
- axis2_char_t *uri_i = AXIOM_NAMESPACE_GET_URI((ns_stack->stack)[i],
+ axis2_char_t *uri_i = axiom_namespace_get_uri((ns_stack->stack)[i],
ctx->env);
if (AXIS2_STRCMP(uri_i, uri) == 0)
return AXIS2_SUCCESS;
@@ -239,8 +239,8 @@
)
{
return (c14n_ns_stack_find_with_prefix_uri(
- AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t *)ns, ctx->env),
- AXIOM_NAMESPACE_GET_URI((axiom_namespace_t *)ns, ctx->env), ctx)
+ axiom_namespace_get_prefix((axiom_namespace_t *)ns, ctx->env),
+ axiom_namespace_get_uri((axiom_namespace_t *)ns, ctx->env), ctx)
);
}
@@ -613,8 +613,8 @@
for (i=0; i<ctx->ns_stack->head; i++)
{
ns1 = ctx->ns_stack->stack[i];
- printf("%s:%s\n", AXIOM_NAMESPACE_GET_PREFIX(ns1, env),
- AXIOM_NAMESPACE_GET_URI(ns1, env));
+ printf("%s:%s\n", axiom_namespace_get_prefix(ns1, env),
+ axiom_namespace_get_uri(ns1, env));
}
printf("%d\n", ctx->ns_stack->size);
@@ -789,7 +789,7 @@
if (ns)
{
- axis2_char_t *prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
+ axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
if (AXIS2_STRLEN(prefix) > 0)
{
@@ -855,7 +855,7 @@
if (ns)
{
- axis2_char_t *prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
+ axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
if (AXIS2_STRLEN(prefix) > 0)
{
@@ -897,9 +897,9 @@
if (!ns2) return 1;
return (AXIS2_STRCMP(
- (const axis2_char_t *)AXIOM_NAMESPACE_GET_URI(
+ (const axis2_char_t *)axiom_namespace_get_uri(
(axiom_namespace_t *)ns1, ctx->env),
- (const axis2_char_t *)AXIOM_NAMESPACE_GET_URI(
+ (const axis2_char_t *)axiom_namespace_get_uri(
(axiom_namespace_t *)ns2, ctx->env)));
}
@@ -917,9 +917,9 @@
if (!ns2) return 1;
return (AXIS2_STRCMP(
- (const axis2_char_t *)AXIOM_NAMESPACE_GET_PREFIX(
+ (const axis2_char_t *)axiom_namespace_get_prefix(
(axiom_namespace_t *)ns1, ctx->env),
- (const axis2_char_t *)AXIOM_NAMESPACE_GET_PREFIX(
+ (const axis2_char_t *)axiom_namespace_get_prefix(
(axiom_namespace_t *)ns2, ctx->env)));
}
@@ -957,8 +957,8 @@
if (!ns2) return 1;
res = AXIS2_STRCMP(
- AXIOM_NAMESPACE_GET_URI(ns1, ctx->env),
- AXIOM_NAMESPACE_GET_URI(ns2, ctx->env));
+ axiom_namespace_get_uri(ns1, ctx->env),
+ axiom_namespace_get_uri(ns2, ctx->env));
if (res == 0)
return AXIS2_STRCMP(
@@ -987,7 +987,7 @@
c14n_output(" ", ctx);
if (ns)
{
- axis2_char_t *prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
+ axis2_char_t *prefix = axiom_namespace_get_prefix(ns, ctx->env);
if (AXIS2_STRLEN(prefix) > 0)
{
@@ -1200,8 +1200,8 @@
{
axiom_namespace_t *ns = (axiom_namespace_t *) v;
- axis2_char_t *pfx = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, ctx->env);
+ axis2_char_t *pfx = axiom_namespace_get_prefix(ns, ctx->env);
+ axis2_char_t *uri = axiom_namespace_get_uri(ns, ctx->env);
if (AXIS2_STRLEN(pfx) == 0)
{
@@ -1225,7 +1225,7 @@
c14n_ns_stack_get_default(ctx);
axis2_char_t *prev_def_uri = ((prev_def) ?
- AXIOM_NAMESPACE_GET_URI(prev_def, ctx->env) : NULL);
+ axiom_namespace_get_uri(prev_def, ctx->env) : NULL);
if (!prev_def_uri || AXIS2_STRCMP(prev_def_uri, uri) != 0)
@@ -1278,11 +1278,11 @@
if (ns)
{
- if (AXIS2_STRLEN(AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t *)ns,
+ if (AXIS2_STRLEN(axiom_namespace_get_prefix((axiom_namespace_t *)ns,
ctx->env)) == 0)
{
axiom_namespace_t *def_ns = c14n_ns_stack_get_default(ctx);
- if (def_ns || AXIS2_STRLEN(AXIOM_NAMESPACE_GET_URI(
+ if (def_ns || AXIS2_STRLEN(axiom_namespace_get_uri(
(axiom_namespace_t *)ns, ctx->env)) != 0)
{
if (ns_uri_compare(ns, def_ns, ctx) != 0)
@@ -1313,8 +1313,8 @@
axis2_char_t *pfx = NULL;
ns = (axiom_namespace_t *) v;
- pfx = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
- /*axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, ctx->env);*/
+ pfx = axiom_namespace_get_prefix(ns, ctx->env);
+ /*axis2_char_t *uri = axiom_namespace_get_uri(ns, ctx->env);*/
if (AXIS2_STRLEN(pfx) == 0)
{
@@ -1354,11 +1354,11 @@
axiom_namespace_t *ns = (axiom_namespace_t *)namespace;
c14n_ctx_t *ctx = (c14n_ctx_t *)context;
- axis2_char_t *pfx = AXIOM_NAMESPACE_GET_PREFIX(ns, ctx->env);
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI(ns, ctx->env);
+ axis2_char_t *pfx = axiom_namespace_get_prefix(ns, ctx->env);
+ axis2_char_t *uri = axiom_namespace_get_uri(ns, ctx->env);
/*c14n_output(" *", ctx);
- c14n_output(AXIOM_NAMESPACE_TO_STRING(ns, ctx->env), ctx);
+ c14n_output(axiom_namespace_to_string(ns, ctx->env), ctx);
c14n_output("*", ctx);*/
if (AXIS2_STRLEN(pfx) > 0)
@@ -1406,7 +1406,7 @@
if (vu || (ctx->ns_prefixes && axis2_array_list_contains(
(axis2_array_list_t*)(ctx->ns_prefixes), ctx->env,
- (void*)(AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t*)ns,
+ (void*)(axiom_namespace_get_prefix((axiom_namespace_t*)ns,
ctx->env)))))
return c14n_no_output_ancestor_uses_prefix(ele, node, ns, ctx);
@@ -1424,9 +1424,9 @@
axis2_bool_t vu = AXIS2_FALSE;
axiom_namespace_t *ns_ele = NULL;
- axis2_char_t *pfx = AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t*)ns,
+ axis2_char_t *pfx = axiom_namespace_get_prefix((axiom_namespace_t*)ns,
ctx->env);
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI((axiom_namespace_t *)ns,
+ axis2_char_t *uri = axiom_namespace_get_uri((axiom_namespace_t *)ns,
ctx->env);
axis2_char_t *pfx_ele = NULL;
axis2_char_t *uri_ele = NULL;
@@ -1435,8 +1435,8 @@
if (ns_ele) /* return AXIS2_FALSE; TODO:check */
{
- pfx_ele = AXIOM_NAMESPACE_GET_PREFIX(ns_ele, ctx->env);
- uri_ele = AXIOM_NAMESPACE_GET_URI(ns_ele, ctx->env);
+ pfx_ele = axiom_namespace_get_prefix(ns_ele, ctx->env);
+ uri_ele = axiom_namespace_get_uri(ns_ele, ctx->env);
}
if ((AXIS2_STRCMP(pfx, pfx_ele) == 0) && (AXIS2_STRCMP(uri, uri_ele) == 0))
vu = AXIS2_TRUE;
@@ -1462,7 +1462,7 @@
/*if in_nodelist(attr) {*/
if (ns_attr)
- attr_pfx = AXIOM_NAMESPACE_GET_PREFIX(
+ attr_pfx = axiom_namespace_get_prefix(
ns_attr, ctx->env);
if (AXIS2_STRCMP(attr_pfx, pfx) == 0)
@@ -1488,9 +1488,9 @@
const c14n_ctx_t *ctx
)
{
- axis2_char_t *pfx = AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t*)ns,
+ axis2_char_t *pfx = axiom_namespace_get_prefix((axiom_namespace_t*)ns,
ctx->env);
- axis2_char_t *uri = AXIOM_NAMESPACE_GET_URI((axiom_namespace_t *)ns,
+ axis2_char_t *uri = axiom_namespace_get_uri((axiom_namespace_t *)ns,
ctx->env);
axiom_node_t *parent_node = AXIOM_NODE_GET_PARENT((axiom_node_t *)node,
@@ -1514,11 +1514,11 @@
if (parent_ns)
{
- parent_pfx = AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t *)parent_ns,
+ parent_pfx = axiom_namespace_get_prefix((axiom_namespace_t *)parent_ns,
ctx->env);
if (AXIS2_STRCMP(pfx, parent_pfx) == 0)
{
- parent_uri = AXIOM_NAMESPACE_GET_URI((axiom_namespace_t*)parent_ns,
+ parent_uri = axiom_namespace_get_uri((axiom_namespace_t*)parent_ns,
ctx->env);
return (!(AXIS2_STRCMP(uri, parent_uri) == 0));
}
@@ -1544,9 +1544,9 @@
if (attr_ns)
{
- attr_pfx = AXIOM_NAMESPACE_GET_PREFIX(
+ attr_pfx = axiom_namespace_get_prefix(
attr_ns, ctx->env);
- attr_uri = AXIOM_NAMESPACE_GET_URI(attr_ns,
+ attr_uri = axiom_namespace_get_uri(attr_ns,
ctx->env);
if (AXIS2_STRCMP(attr_pfx, pfx) == 0)
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_context.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Thu Mar 15 03:58:27 2007
@@ -841,7 +841,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(ret_node_ele, env,ret_node);
if(ns)
{
- namespace_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ namespace_uri = axiom_namespace_get_uri(ns, env);
if (AXIS2_STRCMP(namespace_uri,namespace) == 0)
{
axis2_array_list_add(nodes_to_encrypt,env,ret_node);
@@ -934,7 +934,7 @@
ns = AXIOM_ELEMENT_GET_NAMESPACE(ret_node_ele, env,ret_node);
if(ns)
{
- namespace_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
+ namespace_uri = axiom_namespace_get_uri(ns, env);
if (AXIS2_STRCMP(namespace_uri,namespace) == 0)
{
axis2_array_list_add(nodes_to_encrypt_or_sign,env,ret_node);
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Thu Mar 15 03:58:27 2007
@@ -694,7 +694,7 @@
namespc = axiom_attribute_get_namespace(attr, env);
if (!namespc)
continue;
- namespc_uri = AXIOM_NAMESPACE_GET_URI(namespc, env);
+ namespc_uri = axiom_namespace_get_uri(namespc, env);
local_part = axiom_attribute_get_localname(attr, env);
value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
@@ -3837,8 +3837,8 @@
namespc = axiom_attribute_get_namespace((axiom_attribute_t *) om_attr, env);
if (namespc)
{
- namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(namespc, env);
+ namespc_uri_str = axiom_namespace_get_uri(namespc, env);
+ prefix = axiom_namespace_get_prefix(namespc, env);
}
if (!prefix) prefix = "";
attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
@@ -3910,7 +3910,7 @@
el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
namespc = AXIOM_ELEMENT_GET_NAMESPACE(el, env, el_node);
- namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
+ namespc_uri_str = axiom_namespace_get_uri(namespc, env);
if (NULL == namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_WSDL20)))
{
/* TODO Set error message */
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Thu Mar 15 03:58:27 2007
@@ -687,7 +687,7 @@
namespc = axiom_attribute_get_namespace(attr, env);
if (!namespc)
continue;
- namespc_uri = AXIOM_NAMESPACE_GET_URI(namespc, env);
+ namespc_uri = axiom_namespace_get_uri(namespc, env);
local_part = axiom_attribute_get_localname(attr, env);
value = axiom_attribute_get_value(attr, env);
uri = get_uri(env, value);
@@ -3661,8 +3661,8 @@
namespc = axiom_attribute_get_namespace((axiom_attribute_t *) om_attr, env);
if (namespc)
{
- namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(namespc, env);
+ namespc_uri_str = axiom_namespace_get_uri(namespc, env);
+ prefix = axiom_namespace_get_prefix(namespc, env);
}
if (!prefix) prefix = "";
attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
@@ -3736,7 +3736,7 @@
el = AXIOM_NODE_GET_DATA_ELEMENT(el_node, env);
namespc = AXIOM_ELEMENT_GET_NAMESPACE(el, env, el_node);
- namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
+ namespc_uri_str = axiom_namespace_get_uri(namespc, env);
if (!namespc_uri_str || (0 == AXIS2_STRCMP(namespc_uri_str,
WODEN_WSDL10_NS_URI_WSDL20)))
{
Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Thu Mar 15 03:58:27 2007
@@ -49,7 +49,7 @@
namespc_uri = AXIOM_ELEMENT_FIND_NAMESPACE_URI(context_el,
env, prefix, context_el_node);
- namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc_uri, env);
+ namespc_uri_str = axiom_namespace_get_uri(namespc_uri, env);
if (namespc_uri_str)
{
woden_om_util_register_unique_prefix(env, prefix, namespc_uri_str, namespcs);
Modified: webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_qname_util.c Thu Mar 15 03:58:27 2007
@@ -54,7 +54,7 @@
element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
namespc = AXIOM_ELEMENT_GET_NAMESPACE(element, env, node);
- uri_str = AXIOM_NAMESPACE_GET_URI(namespc, env);
+ uri_str = axiom_namespace_get_uri(namespc, env);
localname = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
return axis2_qname_create(env, localname, uri_str, NULL);
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=518579&r1=518578&r2=518579
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Thu Mar 15 03:58:27 2007
@@ -985,9 +985,9 @@
{
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
- uri = AXIOM_NAMESPACE_GET_URI((axiom_namespace_t*)val, env);
+ uri = axiom_namespace_get_uri((axiom_namespace_t*)val, env);
prefix =
- AXIOM_NAMESPACE_GET_PREFIX((axiom_namespace_t*)val, env);
+ axiom_namespace_get_prefix((axiom_namespace_t*)val, env);
if (prefix && AXIS2_STRCMP(prefix, "") != 0)
{
@@ -2908,7 +2908,7 @@
ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (ns)
{
- namesp = AXIOM_NAMESPACE_GET_URI(ns, env);
+ namesp = axiom_namespace_get_uri(ns, env);
}
}
else
@@ -3217,7 +3217,7 @@
{
ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (ns)
- namesp = AXIOM_NAMESPACE_GET_URI(ns, env);
+ namesp = axiom_namespace_get_uri(ns, env);
}
if (NULL == namesp)
{ /** namespace not found */
@@ -3489,8 +3489,8 @@
axis2_char_t *uri = NULL;
axis2_char_t *prefix = NULL;
ns = (axiom_namespace_t*)val;
- uri = AXIOM_NAMESPACE_GET_URI(ns, env);
- prefix = AXIOM_NAMESPACE_GET_PREFIX(ns, env);
+ uri = axiom_namespace_get_uri(ns, env);
+ prefix = axiom_namespace_get_prefix(ns, env);
axis2_hash_set(ele_to_ns_map, AXIS2_STRDUP(prefix, env),
AXIS2_HASH_KEY_STRING, AXIS2_STRDUP(uri, env));
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org