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 di...@apache.org on 2008/02/14 06:37:28 UTC
svn commit: r627666 - in /webservices/axis2/trunk/c:
axiom/src/om/om_stax_builder.c guththila/include/guththila_token.h
guththila/src/guththila_token.c guththila/src/guththila_xml_parser.c
Author: dinesh
Date: Wed Feb 13 21:37:25 2008
New Revision: 627666
URL: http://svn.apache.org/viewvc?rev=627666&view=rev
Log:
fixed: axis2c-985, thanks lahiru for the patch
Modified:
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/guththila/include/guththila_token.h
webservices/axis2/trunk/c/guththila/src/guththila_token.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.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=627666&r1=627665&r2=627666&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 Feb 13 21:37:25 2008
@@ -600,7 +600,12 @@
if (!(om_builder->lastnode))
{
/* do nothing */
+#ifdef AXIS2_GUTHTHILA_ENABLED
+
+ AXIS2_FREE(env->allocator,comment_value);
+#else
axiom_xml_reader_xml_free(om_builder->parser, env, comment_value);
+#endif
return NULL;
}
else if (axiom_node_is_complete(om_builder->lastnode, env))
Modified: webservices/axis2/trunk/c/guththila/include/guththila_token.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_token.h?rev=627666&r1=627665&r2=627666&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_token.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_token.h Wed Feb 13 21:37:25 2008
@@ -119,8 +119,9 @@
guththila_token_t * tok1,
guththila_token_t * tok2,
const axutil_env_t * env);
-guththila_token_t* GUTHTHILA_CALL
-guththila_token_create(
+void GUTHTHILA_CALL
+guththila_set_token(
+ guththila_token_t* tok,
guththila_char_t* start,
short type,
int size,
Modified: webservices/axis2/trunk/c/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_token.c?rev=627666&r1=627665&r2=627666&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Wed Feb 13 21:37:25 2008
@@ -232,8 +232,9 @@
}
return 0;
}
-guththila_token_t* GUTHTHILA_CALL
-guththila_token_create(guththila_char_t* start,
+void GUTHTHILA_CALL
+guththila_set_token(guththila_token_t* tok,
+ guththila_char_t* start,
short type,
int size,
int _start,
@@ -241,22 +242,13 @@
int ref,
const axutil_env_t* env)
{
- guththila_token_t* tok;
- tok = (guththila_token_t *) AXIS2_MALLOC(env->allocator,sizeof(guththila_token_t));
- if (!tok)
- return NULL;
- tok->start = (guththila_char_t*) AXIS2_MALLOC(env->allocator,size);
- if (!tok->start)
+ if(start)
{
- AXIS2_FREE(env->allocator, tok);
- return NULL;
+ tok->start = start;
+ tok->type = type;
+ tok->_start = _start;
+ tok->size = size;
+ tok->last = last;
+ tok->ref = ref;
}
- memcpy(tok->start,start,size);
- tok->type = type;
- tok->_start = _start;
- tok->size = size;
- tok->last = last;
- tok->ref = ref;
- return tok;
}
-
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.c?rev=627666&r1=627665&r2=627666&view=diff
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.c Wed Feb 13 21:37:25 2008
@@ -150,13 +150,28 @@
guththila_stack_init(&m->elem, env);
guththila_stack_init(&m->attrib, env);
guththila_stack_init(&m->namesp, env);
+ temp_name = guththila_tok_list_get_token(&m->tokens,env);
+ temp_tok = guththila_tok_list_get_token(&m->tokens,env);
+/*
temp_name = guththila_token_create(GUTHTHILA_XML_NAME,0,(int)strlen(GUTHTHILA_XML_NAME),
1,0,0,env);
- /* We are sure that the difference lies within the int range */
+
temp_tok = guththila_token_create(GUTHTHILA_XML_URI,0,(int)strlen(GUTHTHILA_XML_URI),
1,0,0,env);
- /* We are sure that the difference lies within the int range */
- e_namesp = (guththila_elem_namesp_t *) AXIS2_MALLOC(env->allocator,
+
+*/
+ if(temp_tok && temp_name)
+ {
+ guththila_set_token(temp_name,GUTHTHILA_XML_NAME,0,(int)strlen(GUTHTHILA_XML_NAME),
+ 1,0,0,env);
+
+ guththila_set_token(temp_tok,GUTHTHILA_XML_URI,0,(int)strlen(GUTHTHILA_XML_URI),
+ 1,0,0,env);
+
+ }
+
+
+ e_namesp = (guththila_elem_namesp_t *) AXIS2_MALLOC(env->allocator,
sizeof(guththila_elem_namesp_t));
if (e_namesp && temp_tok && temp_name)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org