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 di...@apache.org on 2008/04/16 12:50:23 UTC
svn commit: r648664 - in /webservices/axis2/trunk/c:
axiom/src/om/om_stax_builder.c guththila/include/guththila.h
Author: dinesh
Date: Wed Apr 16 03:50:22 2008
New Revision: 648664
URL: http://svn.apache.org/viewvc?rev=648664&view=rev
Log:
add AXIS2_LIBXML2_ENABLED logics
Modified:
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/guththila/include/guththila.h
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?rev=648664&r1=648663&r2=648664&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Wed Apr 16 03:50:22 2008
@@ -202,18 +202,18 @@
}
if (uri)
{
-#ifdef AXIS2_GUTHTHILA_ENABLED
- AXIS2_FREE(env->allocator,uri);
-#else
+#ifdef AXIS2_LIBXML2_ENABLED
axiom_xml_reader_xml_free(om_builder->parser, env, uri);
+#else
+ AXIS2_FREE(env->allocator,uri);
#endif
}
if (prefix)
{
-#ifdef AXIS2_GUTHTHILA_ENABLED
- AXIS2_FREE(env->allocator,prefix);
-#else
+#ifdef AXIS2_LIBXML2_ENABLED
axiom_xml_reader_xml_free(om_builder->parser, env, prefix);
+#else
+ AXIS2_FREE(env->allocator,prefix);
#endif
}
if (attr_name_str)
@@ -475,10 +475,10 @@
return AXIS2_FAILURE;
}
}
-#ifdef AXIS2_GUTHTHILA_ENABLED
- AXIS2_FREE(env->allocator,temp_prefix);
-#else
+#ifdef AXIS2_LIBXML2_ENABLED
axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
+#else
+ AXIS2_FREE(env->allocator,temp_prefix);
#endif
return status;
}
@@ -607,12 +607,11 @@
if (!(om_builder->lastnode))
{
- /* do nothing */
-#ifdef AXIS2_GUTHTHILA_ENABLED
- AXIS2_FREE(env->allocator,comment_value);
-#else
+#ifdef AXIS2_LIBXML2_ENABLED
axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);
+#else
+ AXIS2_FREE(env->allocator,comment_value);
#endif
return NULL;
}
@@ -641,14 +640,10 @@
om_builder->element_level++;
-#ifdef AXIS2_GUTHTHILA_ENABLED
-
- AXIS2_FREE(env->allocator,comment_value);
-
-#else
-
+#ifdef AXIS2_LIBXML2_ENABLED
axiom_xml_reader_xml_free(om_builder->parser,env,comment_value);
-
+#else
+ AXIS2_FREE(env->allocator,comment_value);
#endif
om_builder->lastnode = comment_node;
@@ -829,12 +824,11 @@
break;
case AXIOM_XML_READER_EMPTY_ELEMENT:
-#ifdef AXIS2_GUTHTHILA_ENABLED
- node = axiom_stax_builder_create_om_element(om_builder, env,
- AXIS2_TRUE);
+
+#ifdef AXIS2_LIBXML2_ENABLED
+ node = axiom_stax_builder_create_om_element(om_builder, env, AXIS2_FALSE);
#else
- node = axiom_stax_builder_create_om_element(om_builder, env,
- AXIS2_FALSE);
+ node = axiom_stax_builder_create_om_element(om_builder, env, AXIS2_TRUE);
#endif
case AXIOM_XML_READER_END_ELEMENT:
@@ -1145,13 +1139,13 @@
break;
case AXIOM_XML_READER_EMPTY_ELEMENT:
-#ifdef AXIS2_GUTHTHILA_ENABLED
- val = axiom_stax_builder_create_om_element(om_builder, env,
- AXIS2_TRUE);
+
+#ifdef AXIS2_LIBXML2_ENABLED
+ val = axiom_stax_builder_create_om_element(om_builder, env, AXIS2_FALSE);
#else
- val = axiom_stax_builder_create_om_element(om_builder, env,
- AXIS2_FALSE);
+ val = axiom_stax_builder_create_om_element(om_builder, env, AXIS2_TRUE);
#endif
+
if (!val)
{
return -1;
Modified: webservices/axis2/trunk/c/guththila/include/guththila.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila.h?rev=648664&r1=648663&r2=648664&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila.h Wed Apr 16 03:50:22 2008
@@ -18,10 +18,6 @@
#ifndef GUTHTHILA_H
#define GUTHTHILA_H
-#ifndef AXIS2_GUTHTHILA_ENABLED
-#define AXIS2_GUTHTHILA_ENABLED
-#endif /* AXIS2_GUTHTHILA_ENABLED */
-
#include <guththila_defines.h>
#include <guththila_token.h>
#include <guththila_reader.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org