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 sh...@apache.org on 2009/08/18 13:08:44 UTC
svn commit: r805360 [8/13] - in /webservices/axis2/trunk/c/axiom/src:
attachments/ om/ parser/ parser/guththila/ parser/libxml2/ soap/ util/ xpath/
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?rev=805360&r1=805359&r2=805360&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Tue Aug 18 11:08:42 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -44,8 +43,7 @@
axis2_char_t *key;
-}
-uri_prefix_element_t;
+} uri_prefix_element_t;
typedef struct axis2_libxml2_writer_wrapper_impl
{
@@ -83,12 +81,14 @@
axiom_xml_writer_t * writer,
const axutil_env_t * env);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_element(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_start_element(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * localname);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_end_start_element(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_end_start_element(
axiom_xml_writer_t * writer,
const axutil_env_t * env);
@@ -107,7 +107,8 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_empty_element(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_empty_element(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * localname);
@@ -127,15 +128,18 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_end_element(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_end_element(
axiom_xml_writer_t * writer,
const axutil_env_t * env);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_end_document(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_end_document(
axiom_xml_writer_t * writer,
const axutil_env_t * env);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_attribute(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_attribute(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * localname,
@@ -158,18 +162,21 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_namespace(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_namespace(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * prefix,
axis2_char_t * namespace_uri);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_default_namespace(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_default_namespace(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * namespace_uri);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_comment(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_comment(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * value);
@@ -187,22 +194,26 @@
axis2_char_t * target,
axis2_char_t * data);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_cdata(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_cdata(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * data);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_dtd(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_dtd(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * dtd);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_entity_ref(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_entity_ref(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * name);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_start_document(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_start_document(
axiom_xml_writer_t * writer,
const axutil_env_t * env);
@@ -219,7 +230,8 @@
axis2_char_t * encoding,
axis2_char_t * version);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_characters(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_characters(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * text);
@@ -229,18 +241,21 @@
const axutil_env_t * env,
axis2_char_t * uri);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_set_prefix(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_set_prefix(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * prefix,
axis2_char_t * uri);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_set_default_prefix(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_set_default_prefix(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * uri);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_encoded(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_encoded(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * text,
@@ -254,7 +269,8 @@
axiom_xml_writer_t * writer,
const axutil_env_t * env);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_flush(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_flush(
axiom_xml_writer_t * writer,
const axutil_env_t * env);
@@ -262,51 +278,58 @@
axiom_xml_writer_t * writer,
const axutil_env_t * env);
-axis2_status_t AXIS2_CALL axis2_libxml2_writer_wrapper_write_raw(
+axis2_status_t AXIS2_CALL
+axis2_libxml2_writer_wrapper_write_raw(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * content);
-static axis2_status_t axis2_libxml2_writer_wrapper_push(
+static axis2_status_t
+axis2_libxml2_writer_wrapper_push(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
const axis2_char_t * uri,
const axis2_char_t * prefix);
-static axis2_bool_t axis2_libxml2_writer_wrapper_is_namespace_declared(
+static axis2_bool_t
+axis2_libxml2_writer_wrapper_is_namespace_declared(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * key);
-static void uri_prefix_element_free(
+static void
+uri_prefix_element_free(
uri_prefix_element_t * up_element,
const axutil_env_t * env);
-static uri_prefix_element_t *uri_prefix_element_create(
+static uri_prefix_element_t *
+uri_prefix_element_create(
const axutil_env_t * env,
const axis2_char_t * uri,
const axis2_char_t * prefix,
const axis2_char_t * real_prefix,
const axis2_char_t * key);
-static void create_key_from_uri_prefix(
+static void
+create_key_from_uri_prefix(
const axutil_env_t * env,
const axis2_char_t * uri,
const axis2_char_t * prefix,
axis2_char_t * array);
-static axis2_char_t *axis2_libxml2_writer_wrapper_find_prefix(
+static axis2_char_t *
+axis2_libxml2_writer_wrapper_find_prefix(
axiom_xml_writer_t * writer,
const axutil_env_t * env,
axis2_char_t * uri);
-static uri_prefix_element_t *axis2_libxml2_writer_wrapper_find_prefix_in_context(
+static uri_prefix_element_t *
+axis2_libxml2_writer_wrapper_find_prefix_in_context(
axutil_array_list_t * context,
const axutil_env_t * env,
axis2_char_t * uri);
-static const axiom_xml_writer_ops_t axiom_xml_writer_ops_var = {
- axis2_libxml2_writer_wrapper_free,
+static const axiom_xml_writer_ops_t axiom_xml_writer_ops_var = { axis2_libxml2_writer_wrapper_free,
axis2_libxml2_writer_wrapper_write_start_element,
axis2_libxml2_writer_wrapper_end_start_element,
axis2_libxml2_writer_wrapper_write_start_element_with_namespace,
@@ -315,8 +338,7 @@
axis2_libxml2_writer_wrapper_write_empty_element_with_namespace,
axis2_libxml2_writer_wrapper_write_empty_element_with_namespace_prefix,
axis2_libxml2_writer_wrapper_write_end_element,
- axis2_libxml2_writer_wrapper_write_end_document,
- axis2_libxml2_writer_wrapper_write_attribute,
+ axis2_libxml2_writer_wrapper_write_end_document, axis2_libxml2_writer_wrapper_write_attribute,
axis2_libxml2_writer_wrapper_write_attribute_with_namespace,
axis2_libxml2_writer_wrapper_write_attribute_with_namespace_prefix,
axis2_libxml2_writer_wrapper_write_namespace,
@@ -324,23 +346,16 @@
axis2_libxml2_writer_wrapper_write_comment,
axis2_libxml2_writer_wrapper_write_processing_instruction,
axis2_libxml2_writer_wrapper_write_processing_instruction_data,
- axis2_libxml2_writer_wrapper_write_cdata,
- axis2_libxml2_writer_wrapper_write_dtd,
+ axis2_libxml2_writer_wrapper_write_cdata, axis2_libxml2_writer_wrapper_write_dtd,
axis2_libxml2_writer_wrapper_write_entity_ref,
axis2_libxml2_writer_wrapper_write_start_document,
axis2_libxml2_writer_wrapper_write_start_document_with_version,
axis2_libxml2_writer_wrapper_write_start_document_with_version_encoding,
- axis2_libxml2_writer_wrapper_write_characters,
- axis2_libxml2_writer_wrapper_get_prefix,
- axis2_libxml2_writer_wrapper_set_prefix,
- axis2_libxml2_writer_wrapper_set_default_prefix,
- axis2_libxml2_writer_wrapper_write_encoded,
- axis2_libxml2_writer_wrapper_get_xml,
- axis2_libxml2_writer_wrapper_get_xml_size,
- axis2_libxml2_writer_wrapper_get_type,
- axis2_libxml2_writer_wrapper_write_raw,
- axis2_libxml2_writer_wrapper_flush
-};
+ axis2_libxml2_writer_wrapper_write_characters, axis2_libxml2_writer_wrapper_get_prefix,
+ axis2_libxml2_writer_wrapper_set_prefix, axis2_libxml2_writer_wrapper_set_default_prefix,
+ axis2_libxml2_writer_wrapper_write_encoded, axis2_libxml2_writer_wrapper_get_xml,
+ axis2_libxml2_writer_wrapper_get_xml_size, axis2_libxml2_writer_wrapper_get_type,
+ axis2_libxml2_writer_wrapper_write_raw, axis2_libxml2_writer_wrapper_flush };
AXIS2_EXTERN axiom_xml_writer_t *AXIS2_CALL
axiom_xml_writer_create(
@@ -352,24 +367,20 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- writer_impl =
- (axis2_libxml2_writer_wrapper_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (axis2_libxml2_writer_wrapper_impl_t));
- if (!writer_impl)
+ writer_impl = (axis2_libxml2_writer_wrapper_impl_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_libxml2_writer_wrapper_impl_t));
+ if(!writer_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create an XML writer wrapper");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create an XML writer wrapper");
return NULL;
}
writer_impl->xml_writer = xmlNewTextWriterFilename(filename, compression);
- if (!(writer_impl->xml_writer))
+ if(!(writer_impl->xml_writer))
{
AXIS2_FREE(env->allocator, writer_impl);
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE);
return NULL;
}
writer_impl->buffer = NULL;
@@ -384,7 +395,7 @@
writer_impl->writer_type = AXIS2_XML_PARSER_TYPE_FILE;
writer_impl->compression = compression;
- if (encoding)
+ if(encoding)
{
writer_impl->encoding = axutil_strdup(env, encoding);
}
@@ -394,12 +405,11 @@
}
writer_impl->uri_prefix_map = axutil_hash_make(env);
- if (!(writer_impl->uri_prefix_map))
+ if(!(writer_impl->uri_prefix_map))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create URI prefix hash map");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create URI prefix hash map");
return NULL;
}
writer_impl->writer.ops = &axiom_xml_writer_ops_var;
@@ -416,15 +426,12 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- writer_impl =
- (axis2_libxml2_writer_wrapper_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (axis2_libxml2_writer_wrapper_impl_t));
- if (!writer_impl)
+ writer_impl = (axis2_libxml2_writer_wrapper_impl_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_libxml2_writer_wrapper_impl_t));
+ if(!writer_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create writer wrapper");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create writer wrapper");
return NULL;
}
@@ -438,23 +445,22 @@
writer_impl->default_lang_namespace = NULL;
writer_impl->compression = compression;
- if (AXIS2_XML_PARSER_TYPE_BUFFER == type)
+ if(AXIS2_XML_PARSER_TYPE_BUFFER == type)
{
writer_impl->writer_type = AXIS2_XML_PARSER_TYPE_BUFFER;
writer_impl->buffer = xmlBufferCreate();
- if (!(writer_impl->buffer))
+ if(!(writer_impl->buffer))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create a buffer for writer wrapper");
+ "No memory. Cannot create a buffer for writer wrapper");
return NULL;
}
- writer_impl->xml_writer =
- xmlNewTextWriterMemory(writer_impl->buffer, 0);
+ writer_impl->xml_writer = xmlNewTextWriterMemory(writer_impl->buffer, 0);
}
- else if (AXIS2_XML_PARSER_TYPE_DOC == type)
+ else if(AXIS2_XML_PARSER_TYPE_DOC == type)
{
writer_impl->writer_type = AXIS2_XML_PARSER_TYPE_DOC;
writer_impl->xml_writer = xmlNewTextWriterDoc(&writer_impl->doc, 0);
@@ -462,20 +468,18 @@
else
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_XML_PARSER_INVALID_MEM_TYPE, AXIS2_FAILURE);
return NULL;
}
- if (!(writer_impl->xml_writer))
+ if(!(writer_impl->xml_writer))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_CREATING_XML_STREAM_WRITER,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_CREATING_XML_STREAM_WRITER, AXIS2_FAILURE);
return NULL;
}
- if (encoding)
+ if(encoding)
{
writer_impl->encoding = axutil_strdup(env, encoding);
}
@@ -485,21 +489,20 @@
}
writer_impl->uri_prefix_map = axutil_hash_make(env);
- if (!(writer_impl->uri_prefix_map))
+ if(!(writer_impl->uri_prefix_map))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create URI prefix hash map");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create URI prefix hash map");
return NULL;
}
writer_impl->stack = axutil_stack_create(env);
- if (!(writer_impl->stack))
+ if(!(writer_impl->stack))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create the stack for writer wrapper");
+ "No memory. Cannot create the stack for writer wrapper");
return NULL;
}
@@ -517,32 +520,32 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (writer_impl->xml_writer)
+ if(writer_impl->xml_writer)
{
xmlFreeTextWriter(writer_impl->xml_writer);
writer_impl->xml_writer = NULL;
}
- if (writer_impl->buffer)
+ if(writer_impl->buffer)
{
xmlBufferFree(writer_impl->buffer);
writer_impl->buffer = NULL;
}
- if (writer_impl->encoding)
+ if(writer_impl->encoding)
{
AXIS2_FREE(env->allocator, writer_impl->encoding);
writer_impl->encoding = NULL;
}
- if (writer_impl->uri_prefix_map)
+ if(writer_impl->uri_prefix_map)
{
axutil_hash_free(writer_impl->uri_prefix_map, env);
writer_impl->uri_prefix_map = NULL;
}
- if (writer_impl->stack)
+ if(writer_impl->stack)
{
axutil_stack_free(writer_impl->stack, env);
writer_impl->stack = NULL;
}
- if (writer_impl->default_lang_namespace)
+ if(writer_impl->default_lang_namespace)
{
uri_prefix_element_free(writer_impl->default_lang_namespace, env);
writer_impl->default_lang_namespace = NULL;
@@ -567,13 +570,10 @@
writer_impl->in_start_element = AXIS2_TRUE;
- status =
- xmlTextWriterStartElement(writer_impl->xml_writer,
- (xmlChar *) localname);
- if (status < 0)
+ status = xmlTextWriterStartElement(writer_impl->xml_writer, (xmlChar *)localname);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -586,7 +586,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/* nothing to do ,
- it is automatically taken care by the libxml2 writer */
+ it is automatically taken care by the libxml2 writer */
return AXIS2_SUCCESS;
}
@@ -606,13 +606,11 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
- NULL, BAD_CAST localname, NULL);
+ NULL, BAD_CAST localname, NULL);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -637,13 +635,12 @@
writer_impl->in_start_element = AXIS2_TRUE;
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
- BAD_CAST prefix,
- BAD_CAST localname, BAD_CAST NULL);
- if (status < 0)
- {
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX,
- AXIS2_FAILURE);
+ BAD_CAST prefix,
+ BAD_CAST localname, BAD_CAST NULL);
+ if(status < 0)
+ {
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -661,21 +658,17 @@
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- status =
- xmlTextWriterStartElement(writer_impl->xml_writer,
- (xmlChar *) localname);
+ status = xmlTextWriterStartElement(writer_impl->xml_writer, (xmlChar *)localname);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
status = xmlTextWriterEndElement(writer_impl->xml_writer);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -697,22 +690,18 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
- NULL, BAD_CAST localname,
- BAD_CAST namespace_uri);
+ NULL, BAD_CAST localname,
+ BAD_CAST namespace_uri);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
status = xmlTextWriterEndElement(writer_impl->xml_writer);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -737,21 +726,19 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
- BAD_CAST prefix,
- BAD_CAST localname, BAD_CAST NULL);
- if (status < 0)
- {
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX,
- AXIS2_FAILURE);
+ BAD_CAST prefix,
+ BAD_CAST localname, BAD_CAST NULL);
+ if(status < 0)
+ {
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_ELEMENT_WITH_NAMESPACE_PREFIX,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
status = xmlTextWriterEndElement(writer_impl->xml_writer);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX,
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -771,14 +758,13 @@
writer_impl->in_start_element = AXIS2_FALSE;
/* write an empty element in case the element is empty,
- status = xmlTextWriterFullEndElement(writer_impl->xml_writer);
- Above call write it like <a></a>.
- Call below will write it like <a/> */
+ status = xmlTextWriterFullEndElement(writer_impl->xml_writer);
+ Above call write it like <a></a>.
+ Call below will write it like <a/> */
status = xmlTextWriterEndElement(writer_impl->xml_writer);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_ELEMENT,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_ELEMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -795,10 +781,9 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterEndDocument(writer_impl->xml_writer);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_DOCUMENT,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_END_DOCUMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -815,18 +800,17 @@
int status = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
- if (!value)
+ if(!value)
{
value = "";
}
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteAttribute(writer_impl->xml_writer,
- BAD_CAST localname, BAD_CAST value);
- if (status < 0)
+ BAD_CAST localname, BAD_CAST value);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -846,20 +830,18 @@
AXIS2_PARAM_CHECK(env->error, localname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE);
- if (!value)
+ if(!value)
{
value = "";
}
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteAttributeNS(writer_impl->xml_writer,
- NULL, BAD_CAST localname,
- BAD_CAST NULL, BAD_CAST value);
- if (status < 0)
- {
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE,
- AXIS2_FAILURE);
+ NULL, BAD_CAST localname,
+ BAD_CAST NULL, BAD_CAST value);
+ if(status < 0)
+ {
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -881,19 +863,17 @@
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
- if (!value)
+ if(!value)
{
value = "";
}
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteAttributeNS(writer_impl->xml_writer,
- BAD_CAST prefix, BAD_CAST localname,
- BAD_CAST NULL, BAD_CAST value);
- if (status < 0)
- {
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX,
- AXIS2_FAILURE);
+ BAD_CAST prefix, BAD_CAST localname,
+ BAD_CAST NULL, BAD_CAST value);
+ if(status < 0)
+ {
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -916,12 +896,10 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (prefix && (axutil_strcmp(prefix, "") != 0))
+ if(prefix && (axutil_strcmp(prefix, "") != 0))
{
- xmlnsprefix = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
- (sizeof(char) *
- (axutil_strlen(prefix) +
- 7)));
+ xmlnsprefix = (axis2_char_t *)AXIS2_MALLOC(env->allocator, (sizeof(char) * (axutil_strlen(
+ prefix) + 7)));
sprintf(xmlnsprefix, "xmlns:%s", prefix);
}
else
@@ -930,16 +908,14 @@
}
status = xmlTextWriterWriteAttribute(writer_impl->xml_writer,
- BAD_CAST xmlnsprefix,
- BAD_CAST namespace_uri);
+ BAD_CAST xmlnsprefix,
+ BAD_CAST namespace_uri);
AXIS2_FREE(env->allocator, xmlnsprefix);
xmlnsprefix = NULL;
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_ATTRIBUTE_WITH_NAMESPACE_PREFIX, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -959,22 +935,21 @@
axis2_char_t *xmlns = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, namespace_uri, AXIS2_FAILURE)
- xmlns = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * (strlen("xmlns") + 1));
+ xmlns = AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_char_t) * (strlen("xmlns") + 1));
sprintf(xmlns, "xmlns");
status = xmlTextWriterWriteAttribute(writer_impl->xml_writer,
- (const xmlChar *) xmlns,
- BAD_CAST namespace_uri);
+ (const xmlChar *) xmlns,
+ BAD_CAST namespace_uri);
- if (xmlns)
+ if(xmlns)
{
AXIS2_FREE(env->allocator, xmlns);
xmlns = NULL;
}
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DEFAULT_NAMESPACE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -993,7 +968,7 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteComment(writer_impl->xml_writer, BAD_CAST value);
- if (status < 0)
+ if(status < 0)
{
AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_COMMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1014,11 +989,9 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartPI(writer_impl->xml_writer, BAD_CAST target);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1039,12 +1012,10 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWritePI(writer_impl->xml_writer,
- BAD_CAST target, BAD_CAST data);
- if (status < 0)
+ BAD_CAST target, BAD_CAST data);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION,
- AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_PROCESSING_INSTRUCTION, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1064,7 +1035,7 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteCDATA(writer_impl->xml_writer, BAD_CAST data);
- if (status < 0)
+ if(status < 0)
{
AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_CDATA, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1084,8 +1055,8 @@
AXIS2_PARAM_CHECK(env->error, dtd, AXIS2_FAILURE);
status = xmlTextWriterStartDTD(writer_impl->xml_writer,
- BAD_CAST dtd, NULL, NULL);
- if (status < 0)
+ BAD_CAST dtd, NULL, NULL);
+ if(status < 0)
{
AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DTD, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1114,12 +1085,10 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
- status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
- NULL, NULL, NULL);
- if (status < 0)
+ status = xmlTextWriterStartDocument(wrapper_impl->xml_writer, NULL, NULL, NULL);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1137,12 +1106,10 @@
AXIS2_PARAM_CHECK(env->error, version, AXIS2_FAILURE);
wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
- status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
- version, NULL, NULL);
- if (status < 0)
+ status = xmlTextWriterStartDocument(wrapper_impl->xml_writer, version, NULL, NULL);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1160,12 +1127,10 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
- status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
- version, encoding, NULL);
- if (status < 0)
+ status = xmlTextWriterStartDocument(wrapper_impl->xml_writer, version, encoding, NULL);
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1186,10 +1151,9 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteString(writer_impl->xml_writer, BAD_CAST text);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -1204,7 +1168,7 @@
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
AXIS2_PARAM_CHECK(env->error, uri, NULL);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (!uri || axutil_strcmp(uri, "") == 0)
+ if(!uri || axutil_strcmp(uri, "") == 0)
{
return NULL;
}
@@ -1227,16 +1191,15 @@
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (axutil_strcmp(uri, "") == 0)
+ if(axutil_strcmp(uri, "") == 0)
{
return AXIS2_FAILURE;
}
create_key_from_uri_prefix(env, uri, prefix, key);
- is_declared =
- axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
- if (!is_declared)
+ is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, key);
+ if(!is_declared)
{
return axis2_libxml2_writer_wrapper_push(writer, env, uri, prefix);
}
@@ -1253,13 +1216,12 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
- if (axutil_strcmp(uri, "") == 0)
+ if(axutil_strcmp(uri, "") == 0)
{
return AXIS2_FAILURE;
}
- is_declared =
- axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, uri);
- if (!is_declared)
+ is_declared = axis2_libxml2_writer_wrapper_is_namespace_declared(writer, env, uri);
+ if(!is_declared)
{
return axis2_libxml2_writer_wrapper_push(writer, env, uri, NULL);
}
@@ -1287,17 +1249,17 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
+ if(writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
{
int output_bytes = 0;
output_bytes = xmlTextWriterFlush(writer_impl->xml_writer);
return writer_impl->buffer->content;
}
- else if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_DOC)
+ else if(writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_DOC)
{
- return (void *) writer_impl->doc;
+ return (void *)writer_impl->doc;
}
- else if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_FILE)
+ else if(writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_FILE)
{
return NULL;
}
@@ -1313,7 +1275,7 @@
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
+ if(writer_impl->writer_type == AXIS2_XML_PARSER_TYPE_BUFFER)
{
return writer_impl->buffer->use;
}
@@ -1330,11 +1292,11 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (writer_impl->xml_writer)
+ if(writer_impl->xml_writer)
{
int ret = 0;
ret = xmlTextWriterFlush(writer_impl->xml_writer);
- if (ret > -1)
+ if(ret > -1)
return AXIS2_SUCCESS;
}
@@ -1364,7 +1326,7 @@
axis2_char_t key[1024];
const axis2_char_t *temp_prefix = NULL;
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (!prefix || axutil_strcmp(prefix, "") == 0)
+ if(!prefix || axutil_strcmp(prefix, "") == 0)
{
temp_prefix = "default";
}
@@ -1373,22 +1335,21 @@
temp_prefix = prefix;
}
- if (writer_impl->stack)
+ if(writer_impl->stack)
{
- current_list = (axutil_array_list_t *)
- axutil_stack_get(writer_impl->stack, env);
+ current_list = (axutil_array_list_t *)axutil_stack_get(writer_impl->stack, env);
- if (current_list)
+ if(current_list)
{
uri_prefix_element_t *ele = NULL;
create_key_from_uri_prefix(env, uri, prefix, key);
ele = uri_prefix_element_create(env, uri, temp_prefix, prefix, key);
- if (ele)
+ if(ele)
{
axutil_array_list_add(current_list, env, ele);
- axutil_hash_set(writer_impl->uri_prefix_map, ele->key,
- AXIS2_HASH_KEY_STRING, ele->prefix);
+ axutil_hash_set(writer_impl->uri_prefix_map, ele->key, AXIS2_HASH_KEY_STRING,
+ ele->prefix);
}
}
}
@@ -1404,12 +1365,11 @@
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (writer_impl->uri_prefix_map && NULL != key)
+ if(writer_impl->uri_prefix_map && NULL != key)
{
void *ret = NULL;
- ret = axutil_hash_get(writer_impl->uri_prefix_map, key,
- AXIS2_HASH_KEY_STRING);
- if (ret)
+ ret = axutil_hash_get(writer_impl->uri_prefix_map, key, AXIS2_HASH_KEY_STRING);
+ if(ret)
{
return AXIS2_TRUE;
}
@@ -1422,24 +1382,24 @@
uri_prefix_element_t * up_element,
const axutil_env_t * env)
{
- if (up_element)
+ if(up_element)
{
- if (up_element->uri)
+ if(up_element->uri)
{
AXIS2_FREE(env->allocator, up_element->uri);
up_element->uri = NULL;
}
- if (up_element->prefix)
+ if(up_element->prefix)
{
AXIS2_FREE(env->allocator, up_element->prefix);
up_element->prefix = NULL;
}
- if (up_element->key)
+ if(up_element->key)
{
AXIS2_FREE(env->allocator, up_element->key);
up_element->key = NULL;
}
- if (up_element->real_prefix)
+ if(up_element->real_prefix)
{
AXIS2_FREE(env->allocator, up_element->real_prefix);
up_element->real_prefix = NULL;
@@ -1459,20 +1419,18 @@
const axis2_char_t * key)
{
uri_prefix_element_t *up_element = NULL;
- up_element = (uri_prefix_element_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (uri_prefix_element_t));
+ up_element = (uri_prefix_element_t *)AXIS2_MALLOC(env->allocator, sizeof(uri_prefix_element_t));
- if (!uri)
+ if(!uri)
{
return NULL;
}
- if (!up_element)
+ if(!up_element)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create URI prefix element %s", uri);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create URI prefix element %s",
+ uri);
return NULL;
}
up_element->key = NULL;
@@ -1481,21 +1439,21 @@
up_element->real_prefix = NULL;
up_element->uri = axutil_strdup(env, uri);
- if (!up_element->uri)
+ if(!up_element->uri)
{
uri_prefix_element_free(up_element, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
up_element->prefix = axutil_strdup(env, prefix);
- if (prefix && !up_element->prefix)
+ if(prefix && !up_element->prefix)
{
uri_prefix_element_free(up_element, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
up_element->key = axutil_strdup(env, key);
- if (key && !up_element->key)
+ if(key && !up_element->key)
{
uri_prefix_element_free(up_element, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1513,7 +1471,7 @@
const axis2_char_t * prefix,
axis2_char_t * array)
{
- if (!prefix)
+ if(!prefix)
{
prefix = "";
}
@@ -1532,29 +1490,27 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (!writer_impl->stack)
+ if(!writer_impl->stack)
{
return NULL;
}
size = axutil_stack_size(writer_impl->stack, env);
- if (size <= 0)
+ if(size <= 0)
{
return NULL;
}
- for (i = size - 1; i < 0; i--)
+ for(i = size - 1; i < 0; i--)
{
axutil_array_list_t *context = NULL;
void *value = NULL;
value = axutil_stack_get_at(writer_impl->stack, env, i);
- if (value)
+ if(value)
{
uri_prefix_element_t *up_ele = NULL;
- context = (axutil_array_list_t *) value;
- up_ele =
- axis2_libxml2_writer_wrapper_find_prefix_in_context(context,
- env, uri);
- if (up_ele)
+ context = (axutil_array_list_t *)value;
+ up_ele = axis2_libxml2_writer_wrapper_find_prefix_in_context(context, env, uri);
+ if(up_ele)
{
return up_ele->real_prefix;
}
@@ -1571,20 +1527,20 @@
{
int size = 0;
int i = 0;
- if (!context)
+ if(!context)
{
return NULL;
}
size = axutil_array_list_size(context, env);
- for (i = 0; i < size; i++)
+ for(i = 0; i < size; i++)
{
uri_prefix_element_t *ele = NULL;
void *value = NULL;
value = axutil_array_list_get(context, env, i);
- if (value)
+ if(value)
{
- ele = (uri_prefix_element_t *) value;
- if (ele->uri && axutil_strcmp(uri, ele->uri))
+ ele = (uri_prefix_element_t *)value;
+ if(ele->uri && axutil_strcmp(uri, ele->uri))
{
return ele;
}
@@ -1606,10 +1562,9 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterWriteRaw(writer_impl->xml_writer, BAD_CAST content);
- if (status < 0)
+ if(status < 0)
{
- AXIS2_HANDLE_ERROR(env,
- AXIS2_ERROR_WRITING_DATA_SOURCE, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_WRITING_DATA_SOURCE, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c?rev=805360&r1=805359&r2=805360&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/xml_reader.c Tue Aug 18 11:08:42 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c?rev=805360&r1=805359&r2=805360&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/xml_writer.c Tue Aug 18 11:08:42 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -51,9 +50,7 @@
axis2_char_t * localname,
axis2_char_t * namespace_uri)
{
- return (writer)->ops->write_start_element_with_namespace(writer, env,
- localname,
- namespace_uri);
+ return (writer)->ops->write_start_element_with_namespace(writer, env, localname, namespace_uri);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -64,11 +61,8 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix)
{
- return (writer)->ops->write_start_element_with_namespace_prefix(writer,
- env,
- localname,
- namespace_uri,
- prefix);
+ return (writer)->ops->write_start_element_with_namespace_prefix(writer, env, localname,
+ namespace_uri, prefix);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -87,9 +81,7 @@
axis2_char_t * localname,
axis2_char_t * namespace_uri)
{
- return (writer)->ops->write_empty_element_with_namespace(writer, env,
- localname,
- namespace_uri);
+ return (writer)->ops->write_empty_element_with_namespace(writer, env, localname, namespace_uri);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -100,11 +92,8 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix)
{
- return (writer)->ops->write_empty_element_with_namespace_prefix(writer,
- env,
- localname,
- namespace_uri,
- prefix);
+ return (writer)->ops->write_empty_element_with_namespace_prefix(writer, env, localname,
+ namespace_uri, prefix);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -141,9 +130,8 @@
axis2_char_t * value,
axis2_char_t * namespace_uri)
{
- return (writer)->ops->write_attribute_with_namespace(writer, env,
- localname, value,
- namespace_uri);
+ return (writer)->ops->write_attribute_with_namespace(writer, env, localname, value,
+ namespace_uri);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -155,11 +143,8 @@
axis2_char_t * namespace_uri,
axis2_char_t * prefix)
{
- return (writer)->ops->write_attribute_with_namespace_prefix(writer, env,
- localname,
- value,
- namespace_uri,
- prefix);
+ return (writer)->ops->write_attribute_with_namespace_prefix(writer, env, localname, value,
+ namespace_uri, prefix);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -206,8 +191,7 @@
axis2_char_t * target,
axis2_char_t * data)
{
- return (writer)->ops->write_processing_instruction_data(writer, env,
- target, data);
+ return (writer)->ops->write_processing_instruction_data(writer, env, target, data);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -251,8 +235,7 @@
const axutil_env_t * env,
axis2_char_t * version)
{
- return (writer)->ops->write_start_document_with_version(writer, env,
- version);
+ return (writer)->ops->write_start_document_with_version(writer, env, version);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -262,10 +245,7 @@
axis2_char_t * version,
axis2_char_t * encoding)
{
- return (writer)->ops->write_start_document_with_version_encoding(writer,
- env,
- encoding,
- version);
+ return (writer)->ops->write_start_document_with_version_encoding(writer, env, encoding, version);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c?rev=805360&r1=805359&r2=805360&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Tue Aug 18 11:08:42 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +30,8 @@
#include <axiom_stax_builder_internal.h>
#include <axiom_node_internal.h>
-static axis2_status_t axiom_soap11_builder_helper_process_text(
+static axis2_status_t
+axiom_soap11_builder_helper_process_text(
axiom_soap11_builder_helper_t * builder_helper,
const axutil_env_t * env);
@@ -56,19 +56,17 @@
axiom_stax_builder_t * om_builder)
{
axiom_soap11_builder_helper_t *builder_helper = NULL;
-
+
AXIS2_PARAM_CHECK(env->error, soap_builder, NULL);
AXIS2_PARAM_CHECK(env->error, om_builder, NULL);
- builder_helper =
- (axiom_soap11_builder_helper_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_soap11_builder_helper_t));
+ builder_helper = (axiom_soap11_builder_helper_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_soap11_builder_helper_t));
- if (!builder_helper)
+ if(!builder_helper)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "No memory. Cannot create SOAP 1.1 builder helper");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "No memory. Cannot create SOAP 1.1 builder helper");
return NULL;
}
@@ -109,200 +107,171 @@
AXIS2_PARAM_CHECK(env->error, om_element_node, AXIS2_FAILURE);
- om_ele =
- (axiom_element_t *) axiom_node_get_data_element(om_element_node, env);
+ om_ele = (axiom_element_t *)axiom_node_get_data_element(om_element_node, env);
ele_localname = axiom_element_get_localname(om_ele, env);
- if (!ele_localname)
+ if(!ele_localname)
{
return AXIS2_FAILURE;
}
- soap_envelope =
- axiom_soap_builder_get_soap_envelope(builder_helper->soap_builder, env);
+ soap_envelope = axiom_soap_builder_get_soap_envelope(builder_helper->soap_builder, env);
- if (!soap_envelope)
+ if(!soap_envelope)
{
return AXIS2_FAILURE;
}
soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
- if (!soap_body)
+ if(!soap_body)
{
return AXIS2_FAILURE;
}
soap_fault = axiom_soap_body_get_fault(soap_body, env);
- if (!soap_fault)
+ if(!soap_fault)
{
return AXIS2_FAILURE;
}
- if (element_level == 4)
+ if(element_level == 4)
{
axiom_soap_fault_code_t *fault_code = NULL;
axiom_soap_fault_value_t *fault_value = NULL;
axiom_node_t *fault_value_node = NULL;
axiom_element_t *fault_value_ele = NULL;
- if (axutil_strcmp
- (ele_localname, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
+ if(axutil_strcmp(ele_localname, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
{
axis2_status_t status = AXIS2_SUCCESS;
- if (builder_helper->fault_string_present)
+ if(builder_helper->fault_string_present)
{
- axiom_soap_builder_set_bool_processing_mandatory_fault_elements
- (builder_helper->soap_builder, env, AXIS2_FALSE);
+ axiom_soap_builder_set_bool_processing_mandatory_fault_elements(
+ builder_helper->soap_builder, env, AXIS2_FALSE);
}
fault_code = axiom_soap_fault_code_create(env);
- if (!fault_code)
+ if(!fault_code)
{
return AXIS2_FAILURE;
}
- axiom_soap_fault_code_set_base_node(fault_code, env,
- om_element_node);
+ axiom_soap_fault_code_set_base_node(fault_code, env, om_element_node);
axiom_soap_fault_set_code(soap_fault, env, fault_code);
- axiom_soap_fault_code_set_builder(fault_code, env,
- builder_helper->soap_builder);
+ axiom_soap_fault_code_set_builder(fault_code, env, builder_helper->soap_builder);
- axiom_element_set_localname(om_ele, env,
- AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
+ axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME);
- fault_value =
- axiom_soap_fault_value_create_with_code(env, fault_code);
- if (!fault_value)
+ fault_value = axiom_soap_fault_value_create_with_code(env, fault_code);
+ if(!fault_value)
{
return AXIS2_FAILURE;
}
- fault_value_node =
- axiom_soap_fault_value_get_base_node(fault_value, env);
- if (!fault_value_node)
+ fault_value_node = axiom_soap_fault_value_get_base_node(fault_value, env);
+ if(!fault_value_node)
{
return AXIS2_FAILURE;
}
- fault_value_ele =
- (axiom_element_t *)
- axiom_node_get_data_element(fault_value_node, env);
-
- axiom_stax_builder_set_lastnode(builder_helper->om_builder,
- env, fault_value_node);
-
- status =
- axiom_soap11_builder_helper_process_text(builder_helper, env);
- if (status == AXIS2_FAILURE)
+ fault_value_ele = (axiom_element_t *)axiom_node_get_data_element(fault_value_node, env);
+
+ axiom_stax_builder_set_lastnode(builder_helper->om_builder, env, fault_value_node);
+
+ status = axiom_soap11_builder_helper_process_text(builder_helper, env);
+ if(status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
- axiom_stax_builder_set_lastnode(builder_helper->om_builder,
- env, om_element_node);
+ axiom_stax_builder_set_lastnode(builder_helper->om_builder, env, om_element_node);
axiom_node_set_complete(om_element_node, env, AXIS2_TRUE);
- axiom_stax_builder_set_element_level(builder_helper->om_builder,
- env, (element_level - 1));
+ axiom_stax_builder_set_element_level(builder_helper->om_builder, env, (element_level
+ - 1));
builder_helper->fault_code_present = AXIS2_TRUE;
}
- else if (axutil_strcmp
- (AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME,
- ele_localname) == 0)
+ else if(axutil_strcmp(AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME, ele_localname) == 0)
{
axiom_soap_fault_reason_t *fault_reason = NULL;
axiom_soap_fault_text_t *fault_text = NULL;
axiom_node_t *fault_text_node = NULL;
int status = AXIS2_SUCCESS;
- if (builder_helper->fault_code_present)
+ if(builder_helper->fault_code_present)
{
- axiom_soap_builder_set_bool_processing_mandatory_fault_elements
- (builder_helper->soap_builder, env, AXIS2_FALSE);
+ axiom_soap_builder_set_bool_processing_mandatory_fault_elements(
+ builder_helper->soap_builder, env, AXIS2_FALSE);
}
- axiom_element_set_localname(om_ele, env,
- AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME);
+ axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_REASON_LOCAL_NAME);
fault_reason = axiom_soap_fault_reason_create(env);
- if (!fault_reason)
+ if(!fault_reason)
{
return AXIS2_FAILURE;
}
- axiom_soap_fault_reason_set_base_node(fault_reason, env,
- om_element_node);
+ axiom_soap_fault_reason_set_base_node(fault_reason, env, om_element_node);
axiom_soap_fault_set_reason(soap_fault, env, fault_reason);
- fault_text =
- axiom_soap_fault_text_create_with_parent(env, fault_reason);
- if (!fault_text)
+ fault_text = axiom_soap_fault_text_create_with_parent(env, fault_reason);
+ if(!fault_text)
{
return AXIS2_FAILURE;
}
- fault_text_node =
- axiom_soap_fault_text_get_base_node(fault_text, env);
- if (!fault_text_node)
+ fault_text_node = axiom_soap_fault_text_get_base_node(fault_text, env);
+ if(!fault_text_node)
{
return AXIS2_FAILURE;
}
- axiom_stax_builder_set_lastnode(builder_helper->om_builder, env,
- fault_text_node);
+ axiom_stax_builder_set_lastnode(builder_helper->om_builder, env, fault_text_node);
- status =
- axiom_soap11_builder_helper_process_text(builder_helper, env);
- if (status == AXIS2_FAILURE)
+ status = axiom_soap11_builder_helper_process_text(builder_helper, env);
+ if(status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
- axiom_stax_builder_set_lastnode(builder_helper->om_builder, env,
- om_element_node);
+ axiom_stax_builder_set_lastnode(builder_helper->om_builder, env, om_element_node);
axiom_node_set_complete(om_element_node, env, AXIS2_TRUE);
- axiom_stax_builder_set_element_level(builder_helper->om_builder,
- env, (element_level - 1));
+ axiom_stax_builder_set_element_level(builder_helper->om_builder, env, (element_level
+ - 1));
builder_helper->fault_string_present = AXIS2_TRUE;
}
- else if (axutil_strcmp
- (AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME, ele_localname) == 0)
+ else if(axutil_strcmp(AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME, ele_localname) == 0)
{
axiom_soap_fault_role_t *fault_role = NULL;
fault_role = axiom_soap_fault_role_create(env);
- if (!fault_role)
+ if(!fault_role)
{
return AXIS2_FAILURE;
}
- axiom_element_set_localname(om_ele, env,
- AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME);
+ axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME);
- axiom_soap_fault_role_set_base_node(fault_role, env,
- om_element_node);
+ axiom_soap_fault_role_set_base_node(fault_role, env, om_element_node);
axiom_soap_fault_set_role(soap_fault, env, fault_role);
/*
- Role element may not have a namespace associated, hence commented, else it segfaults here - Samisa
- status = axiom_soap_builder_process_namespace_data(
- builder_helper->soap_builder, env, om_element_node, AXIS2_TRUE);
- if(status == AXIS2_FAILURE)
- return AXIS2_FAILURE; */
+ Role element may not have a namespace associated, hence commented, else it segfaults here - Samisa
+ status = axiom_soap_builder_process_namespace_data(
+ builder_helper->soap_builder, env, om_element_node, AXIS2_TRUE);
+ if(status == AXIS2_FAILURE)
+ return AXIS2_FAILURE; */
}
- else if (axutil_strcmp
- (AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME,
- ele_localname) == 0)
+ else if(axutil_strcmp(AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME, ele_localname) == 0)
{
axiom_soap_fault_detail_t *fault_detail = NULL;
fault_detail = axiom_soap_fault_detail_create(env);
- if (!fault_detail)
+ if(!fault_detail)
{
return AXIS2_FAILURE;
}
- axiom_element_set_localname(om_ele, env,
- AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME);
+ axiom_element_set_localname(om_ele, env, AXIOM_SOAP12_SOAP_FAULT_DETAIL_LOCAL_NAME);
- axiom_soap_fault_detail_set_base_node(fault_detail, env,
- om_element_node);
+ axiom_soap_fault_detail_set_base_node(fault_detail, env, om_element_node);
axiom_soap_fault_set_detail(soap_fault, env, fault_detail);
}
@@ -311,34 +280,29 @@
return AXIS2_SUCCESS;
}
}
- else if (element_level == 5)
+ else if(element_level == 5)
{
axiom_node_t *parent_node = NULL;
axiom_element_t *parent_element = NULL;
axis2_char_t *parent_localname = NULL;
parent_node = axiom_node_get_parent(om_element_node, env);
- if (!parent_node)
+ if(!parent_node)
{
return AXIS2_FAILURE;
}
- parent_element =
- (axiom_element_t *) axiom_node_get_data_element(om_element_node,
- env);
+ parent_element = (axiom_element_t *)axiom_node_get_data_element(om_element_node, env);
parent_localname = axiom_element_get_localname(parent_element, env);
- if (!parent_localname)
+ if(!parent_localname)
{
return AXIS2_FAILURE;
}
- if (axutil_strcmp
- (parent_localname, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME) == 0)
+ if(axutil_strcmp(parent_localname, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME) == 0)
{
AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "SOAP 1.1 Actor should not have child elements");
+ AXIS2_ERROR_SOAP11_FAULT_ACTOR_SHOULD_NOT_HAVE_CHILD_ELEMENTS, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "SOAP 1.1 Actor should not have child elements");
return AXIS2_FAILURE;
}
}
@@ -354,25 +318,22 @@
token = axiom_stax_builder_next_with_token(builder_helper->om_builder, env);
- if (token == -1)
+ if(token == -1)
{
return AXIS2_FAILURE;
}
- while (token != AXIOM_XML_READER_END_ELEMENT)
+ while(token != AXIOM_XML_READER_END_ELEMENT)
{
- if (token != AXIOM_XML_READER_CHARACTER)
+ if(token != AXIOM_XML_READER_CHARACTER)
{
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_ONLY_CHARACTERS_ARE_ALLOWED_HERE, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Unidentified character in SOAP 1.1 builder helper processing");
+ "Unidentified character in SOAP 1.1 builder helper processing");
return AXIS2_FAILURE;
}
- token =
- axiom_stax_builder_next_with_token(builder_helper->om_builder, env);
- if (token == -1)
+ token = axiom_stax_builder_next_with_token(builder_helper->om_builder, env);
+ if(token == -1)
{
return AXIS2_FAILURE;
}