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 na...@apache.org on 2006/06/13 13:58:27 UTC
svn commit: r413879 - in /webservices/axis2/trunk/c: axiom/src/om/
axiom/src/util/ xml_schema/include/ xml_schema/src/
Author: nandika
Date: Tue Jun 13 04:58:26 2006
New Revision: 413879
URL: http://svn.apache.org/viewvc?rev=413879&view=rev
Log:
warnings removed , Makefile error fixed
Modified:
webservices/axis2/trunk/c/axiom/src/om/Makefile.am
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h
webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
Modified: webservices/axis2/trunk/c/axiom/src/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/Makefile.am?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/om/Makefile.am Tue Jun 13 04:58:26 2006
@@ -19,15 +19,11 @@
libaxis2_axiom_la_LIBADD = \
$(top_builddir)/src/soap/libaxis2_soap.la \
$(top_builddir)/src/attachments/libaxis2_attachments.la \
+ $(top_builddir)/src/util/libaxis2_axiom_util.la \
-laxis2_util
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I$(top_builddir)/src/om \
- -I$(top_builddir)/src/attachments \
- @UTILINC@
-
-EXTRA_DIST = maven.xml project.xml \
- axiom_namespace_internal.h axiom_node_internal.h \
axiom_stax_builder_internal.h
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?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Tue Jun 13 04:58:26 2006
@@ -19,7 +19,6 @@
#include <axis2_array_list.h>
#include <axiom_util.h>
-
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_first_child_element_with_uri(
axiom_node_t *ele_node,
@@ -277,7 +276,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_next_siblng_element_with_localname(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axiom_node_t **next_node)
@@ -315,7 +314,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_first_child_element_with_uri_localname(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
@@ -398,7 +397,7 @@
}
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_last_child_element_with_uri_localname(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *uri,
@@ -496,7 +495,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_first_child_element_with_localnames(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_array_list_t *names,
axiom_node_t **child_node)
@@ -580,7 +579,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_last_child_element_with_localnames(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_array_list_t *names,
axiom_node_t **child_node)
@@ -630,7 +629,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_next_siblng_element_with_localnames(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_array_list_t *names,
axiom_node_t **next_node)
@@ -680,7 +679,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_first_child_element_with_localname_attr(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
@@ -812,7 +811,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_last_child_element_with_localname_attr(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
@@ -891,7 +890,7 @@
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
axiom_util_get_next_siblng_element_with_localname_attr(axiom_element_t *ele,
- axis2_env_t *env,
+ const axis2_env_t *env,
axiom_node_t *ele_node,
axis2_char_t *localname,
axis2_char_t *attr_name,
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_content_processing.h Tue Jun 13 04:58:26 2006
@@ -79,7 +79,7 @@
AXIS2_EXTERN xml_schema_content_processing_t * AXIS2_CALL
xml_schema_content_processing_create(const axis2_env_t *env,
- axis2_char_t* value);
+ const axis2_char_t* value);
/*********************** macros ***********************************************/
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_enum.h Tue Jun 13 04:58:26 2006
@@ -70,7 +70,7 @@
set_value)(
void *schema_enum,
const axis2_env_t *env,
- axis2_char_t *value);
+ const axis2_char_t *value);
axis2_bool_t (AXIS2_CALL *
equals)(void *schema_enum,
@@ -91,7 +91,7 @@
AXIS2_EXTERN xml_schema_enum_t * AXIS2_CALL
xml_schema_enum_create(const axis2_env_t *env,
- axis2_char_t *value);
+ const axis2_char_t *value);
/**
* This method is internal to Axis2 C. It is called from Child Constructor
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Tue Jun 13 04:58:26 2006
@@ -69,7 +69,7 @@
AXIS2_EXTERN xml_schema_content_processing_t * AXIS2_CALL
xml_schema_content_processing_create(const axis2_env_t *env,
- axis2_char_t *value)
+ const axis2_char_t *value)
{
xml_schema_content_processing_impl_t *content_processing_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Tue Jun 13 04:58:26 2006
@@ -65,7 +65,7 @@
xml_schema_enum_set_value(
void *schema_enum,
const axis2_env_t *env,
- axis2_char_t *value);
+ const axis2_char_t *value);
axis2_bool_t AXIS2_CALL
xml_schema_enum_equals(
@@ -82,7 +82,7 @@
AXIS2_EXTERN xml_schema_enum_t * AXIS2_CALL
xml_schema_enum_create(const axis2_env_t *env,
- axis2_char_t *value)
+ const axis2_char_t *value)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
@@ -281,7 +281,7 @@
axis2_status_t AXIS2_CALL
xml_schema_enum_set_value(void *schema_enum,
const axis2_env_t *env,
- axis2_char_t *value)
+ const axis2_char_t *value)
{
xml_schema_enum_impl_t *schema_enum_impl = NULL;
axis2_hash_t *super = NULL;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c?rev=413879&r1=413878&r2=413879&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_facet.c Tue Jun 13 04:58:26 2006
@@ -298,13 +298,21 @@
axis2_bool_t is_fixed = AXIS2_FALSE;
axis2_char_t *value = NULL;
+ axis2_char_t *fixed_value = NULL;
+ axis2_char_t *value_v = NULL;
void *facet = NULL;
int facet_type;
+
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, node, NULL);
+
+
if(AXIOM_NODE_GET_NODE_TYPE(node, env) != AXIOM_ELEMENT)
return NULL;
+ fixed_value = AXIS2_STRDUP("fixed", env);
+ value_v = AXIS2_STRDUP("value", env);
+
om_ele = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
@@ -359,12 +367,12 @@
else
return NULL;
- attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "fixed");
+ attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, fixed_value);
if(NULL != attr_value && AXIS2_STRCMP(attr_value, "fixed") == 0)
is_fixed = AXIS2_TRUE;
attr_value = NULL;
- attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, "value");
+ attr_value = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(om_ele, env, value_v);
if(NULL != attr_value)
value = attr_value;
else
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org