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 du...@apache.org on 2007/12/03 08:54:41 UTC
svn commit: r600441 -
/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
Author: dushshantha
Date: Sun Dec 2 23:54:40 2007
New Revision: 600441
URL: http://svn.apache.org/viewvc?rev=600441&view=rev
Log:
reverted the change to make axis2c work on windows.
Modified:
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
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=600441&r1=600440&r2=600441&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 Sun Dec 2 23:54:40 2007
@@ -65,7 +65,8 @@
axiom_stax_builder_t *om_builder = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, parser, NULL);
-
+
+
om_builder = (axiom_stax_builder_t *) AXIS2_MALLOC(env->allocator,
sizeof
(axiom_stax_builder_t));
@@ -163,7 +164,6 @@
#ifdef WIN32
attr_name_str = axutil_string_create(env, attr_name);
axiom_xml_reader_xml_free(om_builder->parser, env, attr_name);
- /*AXIS2_FREE(env->allocator,attr_name);*/
#else
attr_name_str = axutil_string_create_assume_ownership(env, &attr_name);
#endif
@@ -175,7 +175,6 @@
#ifdef WIN32
attr_value_str = axutil_string_create(env, attr_value);
axiom_xml_reader_xml_free(om_builder->parser, env, attr_value);
- /*AXIS2_FREE(env->allocator,attr_value);*/
#else
attr_value_str =
axutil_string_create_assume_ownership(env, &attr_value);
@@ -203,13 +202,11 @@
}
if (uri)
{
-/* axiom_xml_reader_xml_free(om_builder->parser, env, uri);*/
- AXIS2_FREE(env->allocator,uri);
+ axiom_xml_reader_xml_free(om_builder->parser, env, uri);
}
if (prefix)
{
-/* axiom_xml_reader_xml_free(om_builder->parser, env, prefix);*/
- AXIS2_FREE(env->allocator,prefix);
+ axiom_xml_reader_xml_free(om_builder->parser, env, prefix);
}
if (attr_name_str)
{
@@ -252,9 +249,7 @@
#ifdef WIN32
temp_value_str = axutil_string_create(env, temp_value);
- axiom_xml_reader_xml_free(om_builder->parser, env,temp_value);
- /*AXIS2_FREE(env->allocator,temp_value); */
-
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_value);
#else
temp_value_str = axutil_string_create_assume_ownership(env, &temp_value);
#endif
@@ -433,10 +428,7 @@
axutil_string_free(temp_ns_prefix_str, env);
#ifdef WIN32
axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_uri);
- axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_prefix);
- /*AXIS2_FREE(env->allocator,temp_ns_uri);
- AXIS2_FREE(env->allocator,temp_ns_prefix);*/
-
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_ns_prefix);
#endif
if (!om_ns)
{
@@ -471,8 +463,7 @@
}
if (temp_prefix)
{
-/* axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);*/
- AXIS2_FREE(env->allocator,temp_prefix);
+ axiom_xml_reader_xml_free(om_builder->parser, env, temp_prefix);
}
return status;
}
@@ -502,7 +493,6 @@
#ifdef WIN32
temp_localname_str = axutil_string_create(env, temp_localname);
axiom_xml_reader_xml_free(om_builder->parser, env, temp_localname);
- /*AXIS2_FREE(env->allocator,temp_localname);*/
#else
temp_localname_str =
axutil_string_create_assume_ownership(env, &temp_localname);
@@ -598,10 +588,7 @@
if (!(om_builder->lastnode))
{
/* do nothing */
-/* axiom_xml_reader_xml_free(om_builder->parser, env,
- * comment_value);*/
- AXIS2_FREE(env->allocator, comment_value);
-
+ axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);
return NULL;
}
else if (axiom_node_is_complete(om_builder->lastnode, env))
@@ -628,8 +615,8 @@
}
om_builder->element_level++;
-/* axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);*/
- AXIS2_FREE(env->allocator,comment_value);
+ axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);
+
om_builder->lastnode = comment_node;
return comment_node;
@@ -660,8 +647,7 @@
}
}
om_builder->lastnode = doctype_node;
-/* axiom_xml_reader_xml_free(om_builder->parser, env, doc_value);*/
- AXIS2_FREE(env->allocator,doc_value);
+ axiom_xml_reader_xml_free(om_builder->parser, env, doc_value);
return doctype_node;
}
@@ -685,11 +671,9 @@
}
if (!(om_builder->lastnode))
{
- /* do nothing
+ /* do nothing */
axiom_xml_reader_xml_free(om_builder->parser, env, target);
- axiom_xml_reader_xml_free(om_builder->parser, env, value);*/
- AXIS2_FREE(env->allocator,target);
- AXIS2_FREE(env->allocator,value);
+ axiom_xml_reader_xml_free(om_builder->parser, env, value);
return NULL;
}
else if (axiom_node_is_complete(om_builder->lastnode, env) ||
@@ -717,15 +701,11 @@
if (target)
{
-/* axiom_xml_reader_xml_free(om_builder->parser, env, target);*/
- AXIS2_FREE(env->allocator,target);
-
+ axiom_xml_reader_xml_free(om_builder->parser, env, target);
}
if (value)
{
-/* axiom_xml_reader_xml_free(om_builder->parser, env, value);*/
- AXIS2_FREE(env->allocator,value);
-
+ axiom_xml_reader_xml_free(om_builder->parser, env, value);
}
om_builder->lastnode = pi_node;
@@ -892,7 +872,6 @@
if (om_builder->parser)
{
axiom_xml_reader_free(om_builder->parser, env);
-
om_builder->parser = NULL;
}
@@ -1075,7 +1054,9 @@
{
int token = 0;
void *val = NULL;
-
+/* axutil_env_t* thread = NULL;*/
+/* thread = axutil_env_create(env->allocator);*/
+/* env = thread;*/
if (!om_builder)
{
return -1;
@@ -1152,19 +1133,21 @@
case AXIOM_XML_READER_COMMENT:
val = axiom_stax_builder_create_om_comment(om_builder, env);
- if (val)
+ if (!val)
{
- axiom_stax_builder_end_element(om_builder, env);
+ return -1;
}
+ axiom_stax_builder_end_element(om_builder, env);
break;
case AXIOM_XML_READER_PROCESSING_INSTRUCTION:
val = axiom_stax_builder_create_om_processing_instruction(om_builder,
env);
- if (val)
+ if (!val)
{
- axiom_stax_builder_end_element(om_builder, env);
+ return -1;
}
+ axiom_stax_builder_end_element(om_builder, env);
break;
case AXIOM_XML_READER_CDATA:
@@ -1178,15 +1161,3 @@
}
return token;
}
-
-
-
-
-
-
-
-
-
-
-
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org