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 2007/03/17 08:24:31 UTC
svn commit: r519254 [1/2] - in /webservices/axis2/trunk/c/axiom: include/
src/attachments/ src/om/ src/parser/libxml2/ src/soap/ src/util/ test/soap/
Author: dinesh
Date: Sat Mar 17 00:24:29 2007
New Revision: 519254
URL: http://svn.apache.org/viewvc?view=rev&rev=519254
Log:
patch applied, thanks Diluka
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
webservices/axis2/trunk/c/axiom/src/om/om_comment.c
webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
webservices/axis2/trunk/c/axiom/src/om/om_output.c
webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap_body.c
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Sat Mar 17 00:24:29 2007
@@ -123,8 +123,8 @@
*/
AXIS2_EXTERN axiom_data_handler_t * AXIS2_CALL
axiom_data_handler_create(const axis2_env_t *env,
- const axis2_char_t *file_name,
- const axis2_char_t *mime_type);
+ const axis2_char_t *file_name,
+ const axis2_char_t *mime_type);
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c Sat Mar 17 00:24:29 2007
@@ -37,43 +37,51 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axiom_data_handler_free(axiom_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_free(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env);
axis2_char_t * AXIS2_CALL
-axiom_data_handler_get_content_type(axiom_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_get_content_type(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env);
axis2_byte_t * AXIS2_CALL
-axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axiom_data_handler_read_from(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_byte_t** output_stream, int *output_stream_size);
+axiom_data_handler_read_from(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_byte_t** output_stream, int *output_stream_size);
axis2_status_t AXIS2_CALL
-axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_byte_t* input_stream, int input_stream_len);
+axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_byte_t* input_stream, int input_stream_len);
axis2_status_t AXIS2_CALL
-axiom_data_handler_write_to(axiom_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_write_to(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_char_t* file_name);
+axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_char_t* file_name);
/************************** End of Function headers ************************/
AXIS2_EXTERN axiom_data_handler_t * AXIS2_CALL
axiom_data_handler_create(const axis2_env_t *env,
- const axis2_char_t *file_name,
- const axis2_char_t *mime_type)
+ const axis2_char_t *file_name,
+ const axis2_char_t *mime_type)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- data_handler_impl = (axiom_data_handler_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_data_handler_impl_t));
+ data_handler_impl =
+ (axiom_data_handler_impl_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_data_handler_impl_t));
- if (NULL == data_handler_impl)
+ if (!data_handler_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -87,7 +95,7 @@
if (mime_type)
{
- data_handler_impl->mime_type = AXIS2_STRDUP(mime_type, env);
+ data_handler_impl->mime_type = axis2_strdup(mime_type, env);
if (!(data_handler_impl->mime_type))
{
axiom_data_handler_free(&(data_handler_impl->data_handler), env);
@@ -97,7 +105,7 @@
}
if (file_name)
{
- data_handler_impl->file_name = AXIS2_STRDUP(file_name, env);
+ data_handler_impl->file_name = axis2_strdup(file_name, env);
if (!(data_handler_impl->file_name))
{
axiom_data_handler_free(&(data_handler_impl->data_handler), env);
@@ -112,8 +120,8 @@
}
data_handler_impl->data_handler.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axiom_data_handler_ops_t));
- if (NULL == data_handler_impl->data_handler.ops)
+ sizeof(axiom_data_handler_ops_t));
+ if (!data_handler_impl->data_handler.ops)
{
axiom_data_handler_free(&(data_handler_impl->data_handler), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -121,12 +129,18 @@
}
data_handler_impl->data_handler.ops->free = axiom_data_handler_free;
- data_handler_impl->data_handler.ops->get_content_type = axiom_data_handler_get_content_type;
- data_handler_impl->data_handler.ops->get_input_stream = axiom_data_handler_get_input_stream;
- data_handler_impl->data_handler.ops->read_from = axiom_data_handler_read_from;
- data_handler_impl->data_handler.ops->write_to = axiom_data_handler_write_to;
- data_handler_impl->data_handler.ops->set_binary_data = axiom_data_handler_set_binary_data;
- data_handler_impl->data_handler.ops->set_file_name = axiom_data_handler_set_file_name;
+ data_handler_impl->data_handler.ops->get_content_type =
+ axiom_data_handler_get_content_type;
+ data_handler_impl->data_handler.ops->get_input_stream =
+ axiom_data_handler_get_input_stream;
+ data_handler_impl->data_handler.ops->read_from =
+ axiom_data_handler_read_from;
+ data_handler_impl->data_handler.ops->write_to =
+ axiom_data_handler_write_to;
+ data_handler_impl->data_handler.ops->set_binary_data =
+ axiom_data_handler_set_binary_data;
+ data_handler_impl->data_handler.ops->set_file_name =
+ axiom_data_handler_set_file_name;
return &(data_handler_impl->data_handler);
}
@@ -134,7 +148,8 @@
/*************************** Start of op impls *************************/
axis2_status_t AXIS2_CALL
-axiom_data_handler_free(axiom_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_free(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
@@ -144,55 +159,51 @@
if (data_handler_impl->file_name)
{
AXIS2_FREE(env->allocator, data_handler_impl->file_name);
- data_handler_impl->file_name = NULL;
}
if (data_handler_impl->mime_type)
{
AXIS2_FREE(env->allocator, data_handler_impl->mime_type);
- data_handler_impl->mime_type = NULL;
}
if (data_handler_impl->buffer)
{
AXIS2_FREE(env->allocator, data_handler_impl->buffer);
- data_handler_impl->buffer = NULL;
}
if (data_handler->ops)
{
AXIS2_FREE(env->allocator, data_handler->ops);
- data_handler->ops = NULL;
}
if (data_handler_impl)
{
AXIS2_FREE(env->allocator, data_handler_impl);
- data_handler_impl = NULL;
}
return AXIS2_SUCCESS;
}
axis2_char_t * AXIS2_CALL
-axiom_data_handler_get_content_type(axiom_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_get_content_type(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(data_handler)->mime_type;
}
axis2_byte_t * AXIS2_CALL
-axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_get_input_stream(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
/*@TODO implement the following*/
return (axis2_byte_t *)"";
}
axis2_status_t AXIS2_CALL
-axiom_data_handler_read_from(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_byte_t** output_stream, int *output_stream_size)
+axiom_data_handler_read_from(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_byte_t** output_stream,
+ int *output_stream_size)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
@@ -219,7 +230,8 @@
if (!f)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- " error opening file %s for reading ", data_handler_impl->file_name);
+ " error opening file %s for reading ",
+ data_handler_impl->file_name);
return AXIS2_FAILURE;
}
@@ -229,22 +241,25 @@
if (-1 == stat(data_handler_impl->file_name, &stat_p))
{
return AXIS2_FAILURE;
- }else if(stat_p.st_size == 0){
- *output_stream = NULL;
- *output_stream_size = 0;
- return AXIS2_SUCCESS;
- }
+ }
+ else if(stat_p.st_size == 0)
+ {
+ *output_stream = NULL;
+ *output_stream_size = 0;
+ return AXIS2_SUCCESS;
+ }
read_stream_size = stat_p.st_size;
- read_stream = AXIS2_MALLOC(env->allocator, (read_stream_size) * sizeof(axis2_byte_t));
+ read_stream = AXIS2_MALLOC(env->allocator,
+ (read_stream_size) * sizeof(axis2_byte_t));
if (!read_stream)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
if (byte_stream)
{
AXIS2_FREE(env->allocator, byte_stream);
- byte_stream = NULL;
}
return AXIS2_FAILURE;
}
@@ -252,16 +267,15 @@
if (ferror(f) != 0)
{
/*TODO : need to set the correct error code */
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
if (byte_stream)
{
AXIS2_FREE(env->allocator, byte_stream);
- byte_stream = NULL;
}
if (read_stream)
{
AXIS2_FREE(env->allocator, read_stream);
- read_stream = NULL;
}
return AXIS2_FAILURE;
}
@@ -274,36 +288,36 @@
temp_byte_stream = byte_stream;
temp_byte_stream_size = byte_stream_size;
byte_stream_size = temp_byte_stream_size + count;
- byte_stream = AXIS2_MALLOC(env->allocator, (byte_stream_size) * sizeof(axis2_byte_t));
+ byte_stream = AXIS2_MALLOC(env->allocator,
+ (byte_stream_size) * sizeof(axis2_byte_t));
if (!byte_stream)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
if (read_stream)
{
AXIS2_FREE(env->allocator, read_stream);
- read_stream = NULL;
}
if (temp_byte_stream)
{
AXIS2_FREE(env->allocator, temp_byte_stream);
- temp_byte_stream = NULL;
}
return AXIS2_FAILURE;
}
- memcpy(byte_stream, temp_byte_stream, temp_byte_stream_size);
- memcpy(byte_stream + temp_byte_stream_size, read_stream, count);
+ memcpy(byte_stream,
+ temp_byte_stream, temp_byte_stream_size);
+ memcpy(byte_stream + temp_byte_stream_size,
+ read_stream, count);
if (read_stream)
{
AXIS2_FREE(env->allocator, read_stream);
- read_stream = NULL;
read_stream_size = 0;
}
if (temp_byte_stream)
{
AXIS2_FREE(env->allocator, temp_byte_stream);
- temp_byte_stream = NULL;
temp_byte_stream_size = 0;
}
}
@@ -320,7 +334,6 @@
if (read_stream)
{
AXIS2_FREE(env->allocator, read_stream);
- read_stream = NULL;
}
}
}
@@ -336,8 +349,9 @@
}
axis2_status_t AXIS2_CALL
-axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_byte_t* input_stream, int input_stream_len)
+axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_byte_t* input_stream, int input_stream_len)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
@@ -350,7 +364,8 @@
}
axis2_status_t AXIS2_CALL
-axiom_data_handler_write_to(axiom_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_write_to(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
@@ -366,11 +381,13 @@
if (!f)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- " error opening file %s for writing ", data_handler_impl->file_name);
+ " error opening file %s for writing ",
+ data_handler_impl->file_name);
return AXIS2_FAILURE;
}
- count = fwrite(data_handler_impl->buffer, 1, data_handler_impl->buffer_len, f);
+ count = fwrite(data_handler_impl->buffer,
+ 1, data_handler_impl->buffer_len, f);
if (ferror(f) != 0)
{
@@ -385,8 +402,9 @@
}
axis2_status_t AXIS2_CALL
-axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler, const axis2_env_t *env,
- axis2_char_t* file_name)
+axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler,
+ const axis2_env_t *env,
+ axis2_char_t* file_name)
{
axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -396,12 +414,11 @@
if (data_handler_impl->file_name)
{
AXIS2_FREE(env->allocator, data_handler_impl->file_name);
- data_handler_impl->file_name = NULL;
}
if (file_name)
{
- data_handler_impl->file_name = AXIS2_STRDUP(file_name, env);
+ data_handler_impl->file_name = axis2_strdup(file_name, env);
if (!(data_handler_impl->file_name))
{
axiom_data_handler_free(&(data_handler_impl->data_handler), env);
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c Sat Mar 17 00:24:29 2007
@@ -37,20 +37,25 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env);
+axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part,
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axiom_mime_body_part_add_header(axiom_mime_body_part_t *mime_body_part,
- const axis2_env_t *env,
- const axis2_char_t *name,
- const axis2_char_t *value);
+ const axis2_env_t *env,
+ const axis2_char_t *name,
+ const axis2_char_t *value);
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_set_data_handler(axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, axiom_data_handler_t *data_handler);
+axiom_mime_body_part_set_data_handler(axiom_mime_body_part_t *mime_body_part,
+ const axis2_env_t *env,
+ axiom_data_handler_t *data_handler);
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env,
- axis2_byte_t **output_stream, int *output_stream_size);
+axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part,
+ const axis2_env_t *env,
+ axis2_byte_t **output_stream,
+ int *output_stream_size);
/************************** End of Function headers ************************/
AXIS2_EXTERN axiom_mime_body_part_t * AXIS2_CALL
@@ -60,9 +65,9 @@
AXIS2_ENV_CHECK(env, NULL);
mime_body_part_impl = (axiom_mime_body_part_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_mime_body_part_impl_t));
+ sizeof(axiom_mime_body_part_impl_t));
- if (NULL == mime_body_part_impl)
+ if (!mime_body_part_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -81,8 +86,8 @@
}
mime_body_part_impl->mime_body_part.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axiom_mime_body_part_ops_t));
- if (NULL == mime_body_part_impl->mime_body_part.ops)
+ sizeof(axiom_mime_body_part_ops_t));
+ if (!mime_body_part_impl->mime_body_part.ops)
{
axiom_mime_body_part_free(&(mime_body_part_impl->mime_body_part), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -100,7 +105,8 @@
/*************************** Start of op impls *************************/
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env)
+axiom_mime_body_part_free(axiom_mime_body_part_t *mime_body_part,
+ const axis2_env_t *env)
{
axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
@@ -113,7 +119,7 @@
const void *key = NULL;
void *value = NULL;
for (hash_index = axis2_hash_first(mime_body_part_impl->header_map, env);
- hash_index; hash_index = axis2_hash_next(env, hash_index))
+ hash_index; hash_index = axis2_hash_next(env, hash_index))
{
axis2_hash_this(hash_index, &key, NULL, &value);
if (value)
@@ -130,13 +136,11 @@
if (mime_body_part->ops)
{
AXIS2_FREE(env->allocator, mime_body_part->ops);
- mime_body_part->ops = NULL;
}
if (mime_body_part_impl)
{
AXIS2_FREE(env->allocator, mime_body_part_impl);
- mime_body_part_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -145,9 +149,9 @@
axis2_status_t AXIS2_CALL
axiom_mime_body_part_add_header(axiom_mime_body_part_t *mime_body_part,
- const axis2_env_t *env,
- const axis2_char_t *name,
- const axis2_char_t *value)
+ const axis2_env_t *env,
+ const axis2_char_t *name,
+ const axis2_char_t *value)
{
axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
@@ -157,13 +161,13 @@
mime_body_part_impl = AXIS2_INTF_TO_IMPL(mime_body_part);
axis2_hash_set(mime_body_part_impl->header_map, name,
- AXIS2_HASH_KEY_STRING, value);
+ AXIS2_HASH_KEY_STRING, value);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axiom_mime_body_part_set_data_handler(axiom_mime_body_part_t *mime_body_part,
- const axis2_env_t *env, axiom_data_handler_t *data_handler)
+ const axis2_env_t *env, axiom_data_handler_t *data_handler)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(mime_body_part)->data_handler = data_handler;
@@ -171,8 +175,9 @@
}
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env,
- axis2_byte_t **output_stream, int *output_stream_size)
+axiom_mime_body_part_write_to(axiom_mime_body_part_t *mime_body_part,
+ const axis2_env_t *env,
+ axis2_byte_t **output_stream, int *output_stream_size)
{
axiom_mime_body_part_impl_t *mime_body_part_impl = NULL;
axis2_hash_index_t *hash_index = NULL;
@@ -192,24 +197,24 @@
mime_body_part_impl = AXIS2_INTF_TO_IMPL(mime_body_part);
for (hash_index = axis2_hash_first(mime_body_part_impl->header_map, env);
- hash_index; hash_index = axis2_hash_next(env, hash_index))
+ hash_index; hash_index = axis2_hash_next(env, hash_index))
{
axis2_hash_this(hash_index, &key, NULL, &value);
if (key && value)
{
- temp_header_str = AXIS2_STRACAT(header_str, (axis2_char_t*)key, env);
+ temp_header_str = axis2_stracat(header_str, (axis2_char_t*)key, env);
if (header_str)
{
AXIS2_FREE(env->allocator, header_str);
}
header_str = temp_header_str;
- temp_header_str = AXIS2_STRACAT(header_str, ": ", env);
+ temp_header_str = axis2_stracat(header_str, ": ", env);
AXIS2_FREE(env->allocator, header_str);
header_str = temp_header_str;
- temp_header_str = AXIS2_STRACAT(header_str, (axis2_char_t*)value, env);
+ temp_header_str = axis2_stracat(header_str, (axis2_char_t*)value, env);
AXIS2_FREE(env->allocator, header_str);
header_str = temp_header_str;
- temp_header_str = AXIS2_STRACAT(header_str, "\r\n", env);
+ temp_header_str = axis2_stracat(header_str, "\r\n", env);
AXIS2_FREE(env->allocator, header_str);
header_str = temp_header_str;
}
@@ -217,14 +222,15 @@
if (mime_body_part_impl->data_handler)
{
- temp_header_str = AXIS2_STRACAT(header_str, "\r\n", env);
+ temp_header_str = axis2_stracat(header_str, "\r\n", env);
AXIS2_FREE(env->allocator, header_str);
header_str = temp_header_str;
-
}
if (header_str)
- header_str_size = AXIS2_STRLEN(header_str);
+ {
+ header_str_size = axis2_strlen(header_str);
+ }
/* TODO encoding needs to be done, we only support binary as of now,
Java supports "base64", "uuencode", "x-uuencode", "x-uue",
@@ -233,9 +239,11 @@
if (mime_body_part_impl->data_handler)
{
status = AXIOM_DATA_HANDLER_READ_FROM(mime_body_part_impl->data_handler, env,
- &data_handler_stream, &data_handler_stream_size);
+ &data_handler_stream, &data_handler_stream_size);
if (status == AXIS2_FAILURE)
+ {
return AXIS2_FAILURE;
+ }
}
size = header_str_size + data_handler_stream_size;
@@ -246,12 +254,10 @@
if (data_handler_stream)
{
AXIS2_FREE(env->allocator, data_handler_stream);
- data_handler_stream = NULL;
}
if (header_str)
{
AXIS2_FREE(env->allocator, header_str);
- header_str = NULL;
}
return AXIS2_FAILURE;
}
@@ -260,14 +266,12 @@
{
memcpy(byte_stream, header_str, header_str_size);
AXIS2_FREE(env->allocator, header_str);
- header_str = NULL;
}
if (data_handler_stream)
{
- memcpy(byte_stream + header_str_size, data_handler_stream, data_handler_stream_size);
- /*AXIS2_FREE(env->allocator, data_handler_stream);
- data_handler_stream = NULL;*/
+ memcpy(byte_stream + header_str_size,
+ data_handler_stream, data_handler_stream_size);
}
*output_stream = byte_stream;
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Sat Mar 17 00:24:29 2007
@@ -44,7 +44,7 @@
axis2_byte_t *bytes;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- length = AXIS2_STRLEN(char_buffer);
+ length = axis2_strlen(char_buffer);
bytes = AXIS2_MALLOC(env->allocator, length * sizeof(axis2_byte_t));
for (i = 0; i < length; i++)
@@ -197,17 +197,17 @@
root_mime_body_part = axiom_mime_body_part_create(env);
/* content-type */
- header_value = AXIS2_STRDUP("application/xop+xml; charset=", env);
- temp_header_value = AXIS2_STRACAT(header_value, char_set_encoding, env);
+ header_value = axis2_strdup("application/xop+xml; charset=", env);
+ temp_header_value = axis2_stracat(header_value, char_set_encoding, env);
AXIS2_FREE(env->allocator, header_value);
header_value = temp_header_value;
- temp_header_value = AXIS2_STRACAT(header_value, "; type=\"", env);
+ temp_header_value = axis2_stracat(header_value, "; type=\"", env);
AXIS2_FREE(env->allocator, header_value);
header_value = temp_header_value;
- temp_header_value = AXIS2_STRACAT(header_value, soap_content_type, env);
+ temp_header_value = axis2_stracat(header_value, soap_content_type, env);
AXIS2_FREE(env->allocator, header_value);
header_value = temp_header_value;
- temp_header_value = AXIS2_STRACAT(header_value, "\";", env);
+ temp_header_value = axis2_stracat(header_value, "\";", env);
AXIS2_FREE(env->allocator, header_value);
header_value = temp_header_value;
AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-type", header_value);
@@ -217,8 +217,8 @@
/* content-id */
content_id_string = (axis2_char_t *)"<";
- content_id_string = AXIS2_STRACAT(content_id_string, content_id, env);
- temp_content_id_string = AXIS2_STRACAT(content_id_string, ">", env);
+ content_id_string = axis2_stracat(content_id_string, content_id, env);
+ temp_content_id_string = axis2_stracat(content_id_string, ">", env);
AXIS2_FREE(env->allocator, content_id_string);
content_id_string = temp_content_id_string;
AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-id", content_id_string);
@@ -292,12 +292,12 @@
if (soap_body_buffer)
{
- temp_soap_body_buffer = AXIS2_STRACAT(soap_body_buffer, "\r\n", env);
+ temp_soap_body_buffer = axis2_stracat(soap_body_buffer, "\r\n", env);
/*AXIS2_FREE(env->allocator, soap_body_buffer);*/
soap_body_buffer = temp_soap_body_buffer;
- soap_body_buffer_size = AXIS2_STRLEN(soap_body_buffer);
+ soap_body_buffer_size = axis2_strlen(soap_body_buffer);
}
stream_buffer_size = output_stream_start_size + output_stream_body_size +
@@ -419,9 +419,9 @@
AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
data_handler);
- content_id = AXIS2_STRACAT(content_id,
+ content_id = axis2_stracat(content_id,
axiom_text_get_content_id(text, env), env);
- temp_content_id = AXIS2_STRACAT(content_id, ">", env);
+ temp_content_id = axis2_stracat(content_id, ">", env);
AXIS2_FREE(env->allocator, content_id);
content_id = temp_content_id;
@@ -532,64 +532,64 @@
AXIS2_ENV_CHECK(env, NULL);
- content_type_string = AXIS2_STRDUP("multipart/related", env);
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "; ", env);
+ content_type_string = axis2_strdup("multipart/related", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "; ", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
if (boundary)
{
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "boundary=", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "boundary=", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, boundary, env);
+ temp_content_type_string = axis2_stracat(content_type_string, boundary, env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "; ", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "; ", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
}
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "type=\"application/xop+xml\"", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "type=\"application/xop+xml\"", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "; ", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "; ", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
if (content_id)
{
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "start=\"<", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "start=\"<", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, content_id , env);
+ temp_content_type_string = axis2_stracat(content_type_string, content_id , env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, ">\"", env);
+ temp_content_type_string = axis2_stracat(content_type_string, ">\"", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "; ", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "; ", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
}
if (soap_content_type)
{
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "start-info=\"", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "start-info=\"", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, soap_content_type, env);
+ temp_content_type_string = axis2_stracat(content_type_string, soap_content_type, env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "\"; ", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "\"; ", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
}
if (char_set_encoding)
{
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "charset=\"", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "charset=\"", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, char_set_encoding, env);
+ temp_content_type_string = axis2_stracat(content_type_string, char_set_encoding, env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
- temp_content_type_string = AXIS2_STRACAT(content_type_string, "\"", env);
+ temp_content_type_string = axis2_stracat(content_type_string, "\"", env);
AXIS2_FREE(env->allocator, content_type_string);
content_type_string = temp_content_type_string;
}
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Sat Mar 17 00:24:29 2007
@@ -40,26 +40,27 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axiom_mime_parser_free(axiom_mime_parser_t *mime_parser, const axis2_env_t *env);
+axiom_mime_parser_free(axiom_mime_parser_t *mime_parser,
+ const axis2_env_t *env);
axis2_hash_t* AXIS2_CALL
axiom_mime_parser_parse(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env,
- AXIS2_READ_INPUT_CALLBACK,
- void *callback_ctx,
- axis2_char_t *mime_boundary);
+ const axis2_env_t *env,
+ AXIS2_READ_INPUT_CALLBACK,
+ void *callback_ctx,
+ axis2_char_t *mime_boundary);
axis2_hash_t* AXIS2_CALL
axiom_mime_parser_get_mime_parts_map(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
int AXIS2_CALL
axiom_mime_parser_get_soap_body_len(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_char_t* AXIS2_CALL
axiom_mime_parser_get_soap_body_str(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/************************** End of Function headers ************************/
@@ -71,9 +72,9 @@
AXIS2_ENV_CHECK(env, NULL);
mime_parser_impl = (axiom_mime_parser_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axiom_mime_parser_impl_t));
+ sizeof(axiom_mime_parser_impl_t));
- if (NULL == mime_parser_impl)
+ if (!mime_parser_impl)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -92,8 +93,8 @@
}
mime_parser_impl->mime_parser.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axiom_mime_parser_ops_t));
- if (NULL == mime_parser_impl->mime_parser.ops)
+ sizeof(axiom_mime_parser_ops_t));
+ if (!mime_parser_impl->mime_parser.ops)
{
axiom_mime_parser_free(&(mime_parser_impl->mime_parser), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -113,7 +114,8 @@
axis2_status_t AXIS2_CALL
-axiom_mime_parser_free(axiom_mime_parser_t *mime_parser, const axis2_env_t *env)
+axiom_mime_parser_free(axiom_mime_parser_t *mime_parser,
+ const axis2_env_t *env)
{
axiom_mime_parser_impl_t *mime_parser_impl = NULL;
@@ -122,28 +124,15 @@
/* This map is passed on to SOAP builder, and SOAP builder take over the
ownership of the map */
- /*if (mime_parser_impl->mime_parts_map)
- {
- axis2_hash_free(mime_parser_impl->mime_parts_map, env);
- mime_parser_impl->mime_parts_map = NULL;
- }*/
-
- /*if (mime_parser_impl->soap_body_str)
- {
- AXIS2_FREE(env->allocator, mime_parser_impl->soap_body_str);
- mime_parser_impl->soap_body_str = NULL;
- }*/
-
+
if (mime_parser->ops)
{
AXIS2_FREE(env->allocator, mime_parser->ops);
- mime_parser->ops = NULL;
}
if (mime_parser_impl)
{
AXIS2_FREE(env->allocator, mime_parser_impl);
- mime_parser_impl = NULL;
}
return AXIS2_SUCCESS;
@@ -185,28 +174,27 @@
{
axis2_char_t *temp_root_mime = root_mime;
root_mime = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (root_mime_len + len + 1));
+ sizeof(char) * (root_mime_len + len + 1));
if (root_mime)
{
if (temp_root_mime)
{
memcpy(root_mime, temp_root_mime, root_mime_len);
AXIS2_FREE(env->allocator, temp_root_mime);
- temp_root_mime = NULL;
}
memcpy(root_mime + root_mime_len, buffer, len);
root_mime_len += len;
root_mime[root_mime_len] = '\0';
- pos = AXIS2_STRSTR(root_mime, "\r\n\r\n");
+ pos = axis2_strstr(root_mime, "\r\n\r\n");
if (pos)
{
if (root_mime_len > (pos - root_mime + 4))
{
soap_body_len = root_mime_len - (pos - root_mime + 4);
soap_body_str = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (soap_body_len + 1));
+ sizeof(char) * (soap_body_len + 1));
memcpy(soap_body_str, pos + 4, soap_body_len);
soap_body_str[soap_body_len] = '\0';
*pos = '\0';
@@ -217,12 +205,6 @@
}
while (!pos && len > 0);
- /*if (root_mime)
- {
- AXIS2_FREE(env->allocator, root_mime);
- root_mime = NULL;
- }*/
-
pos = NULL;
len = 0;
@@ -230,7 +212,7 @@
{
if (soap_body_str)
{
- pos = AXIS2_STRSTR(soap_body_str, mime_boundary);
+ pos = axis2_strstr(soap_body_str, mime_boundary);
}
if (pos)
@@ -238,7 +220,7 @@
pos -= 2;
body_mime_len = soap_body_len - (pos - soap_body_str);
body_mime = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (body_mime_len + 1));
+ sizeof(char) * (body_mime_len + 1));
memcpy(body_mime, pos, body_mime_len);
body_mime[body_mime_len] = '\0';
@@ -252,14 +234,13 @@
{
axis2_char_t *temp_soap_body = soap_body_str;
soap_body_str = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (soap_body_len + len + 1));
+ sizeof(char) * (soap_body_len + len + 1));
if (soap_body_str)
{
if (temp_soap_body)
{
memcpy(soap_body_str, temp_soap_body, soap_body_len);
AXIS2_FREE(env->allocator, temp_soap_body);
- temp_soap_body = NULL;
}
memcpy(soap_body_str + soap_body_len, buffer, len);
@@ -294,7 +275,7 @@
{
if (body_mime)
{
- pos = AXIS2_STRSTR(body_mime, "\r\n\r\n");
+ pos = axis2_strstr(body_mime, "\r\n\r\n");
}
if (pos)
@@ -303,7 +284,7 @@
{
mime_binary_len = body_mime_len - (pos - body_mime + 4);
mime_binary = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (mime_binary_len + 1));
+ sizeof(char) * (mime_binary_len + 1));
memcpy(mime_binary, pos + 4, mime_binary_len);
mime_binary[mime_binary_len] = '\0';
*pos = '\0';
@@ -317,14 +298,13 @@
count = 0;
temp_body_mime = body_mime;
body_mime = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (body_mime_len + len + 1));
+ sizeof(char) * (body_mime_len + len + 1));
if (body_mime)
{
if (temp_body_mime)
{
memcpy(body_mime, temp_body_mime, body_mime_len);
AXIS2_FREE(env->allocator, temp_body_mime);
- temp_body_mime = NULL;
}
memcpy(body_mime + body_mime_len, buffer, len);
@@ -350,7 +330,7 @@
do
{
pos = memchr(old_pos, AXIOM_MIME_BOUNDARY_BYTE,
- (mime_binary_len - (old_pos - mime_binary)));
+ (mime_binary_len - (old_pos - mime_binary)));
if (!pos)
break;
else
@@ -361,7 +341,7 @@
pos = NULL;
break;
}
- temp_pos = AXIS2_STRSTR(pos + 1, mime_boundary);
+ temp_pos = axis2_strstr(pos + 1, mime_boundary);
}
}
while (*(pos + 1) != AXIOM_MIME_BOUNDARY_BYTE || temp_pos != pos + 2);
@@ -384,14 +364,13 @@
count = 0;
temp_mime_binary = mime_binary;
mime_binary = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (mime_binary_len + len + 1));
+ sizeof(char) * (mime_binary_len + len + 1));
if (mime_binary)
{
if (temp_mime_binary)
{
memcpy(mime_binary, temp_mime_binary, mime_binary_len);
AXIS2_FREE(env->allocator, temp_mime_binary);
- temp_mime_binary = NULL;
}
memcpy(mime_binary + mime_binary_len, buffer, len);
@@ -403,14 +382,14 @@
else
{
axis2_char_t *temp_pos = NULL;
- temp_pos = pos + 2 + AXIS2_STRLEN(mime_boundary);
+ temp_pos = pos + 2 + axis2_strlen(mime_boundary);
end_of_mime = (AXIOM_MIME_BOUNDARY_BYTE == *(temp_pos)) &&
- (AXIOM_MIME_BOUNDARY_BYTE == *(temp_pos + 1));
+ (AXIOM_MIME_BOUNDARY_BYTE == *(temp_pos + 1));
/* capture the next mime part */
temp_body_mime = AXIS2_MALLOC(env->allocator,
- sizeof(char) * (old_mime_binary_len - mime_binary_len + 1));
+ sizeof(char) * (old_mime_binary_len - mime_binary_len + 1));
if (temp_body_mime)
{
memcpy(temp_body_mime, pos, old_mime_binary_len - mime_binary_len);
@@ -435,19 +414,25 @@
{
axis2_char_t *end = NULL;
axis2_char_t *temp_type = NULL;
- type += AXIS2_STRLEN(AXIOM_MIME_PARSER_CONTENT_TYPE);
+ type += axis2_strlen(AXIOM_MIME_PARSER_CONTENT_TYPE);
while (type && *type && *type != ':')
+ {
type++;
+ }
type++;
while (type && *type && *type == ' ')
+ {
type++;
+ }
end = type;
while (end && *end && !isspace(*end))
+ {
end++;
+ }
if ((end - type) > 0)
{
temp_type = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * ((end - type) + 1));
+ sizeof(axis2_char_t) * ((end - type) + 1));
memcpy(temp_type, type, (end - type));
temp_type[end - type] = '\0';
type = temp_type;
@@ -456,7 +441,7 @@
}
if (id)
{
- id += AXIS2_STRLEN(AXIOM_MIME_PARSER_CONTENT_ID);
+ id += axis2_strlen(AXIOM_MIME_PARSER_CONTENT_ID);
while (id && *id && *id != ':')
id++;
if (id)
@@ -467,14 +452,14 @@
if (id)
{
axis2_char_t *pos = NULL;
- pos = AXIS2_STRSTR(id, ">");
+ pos = axis2_strstr(id, ">");
if (pos)
{
axis2_char_t *mime_id = NULL;
int mime_id_len = 0;
mime_id_len = pos - id;
mime_id = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_char_t) * mime_id_len + 1); /* this would be freed by SOAP builder*/
+ sizeof(axis2_char_t) * mime_id_len + 1); /* this would be freed by SOAP builder*/
if (mime_id)
{
@@ -484,12 +469,11 @@
data_handler = axiom_data_handler_create(env, NULL, type);
AXIS2_FREE(env->allocator, type);
- type = NULL;
AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env,
- mime_binary, mime_binary_len);
+ mime_binary, mime_binary_len);
axis2_hash_set(mime_parser_impl->mime_parts_map, mime_id,
- AXIS2_HASH_KEY_STRING, data_handler);
+ AXIS2_HASH_KEY_STRING, data_handler);
}
}
}
@@ -501,15 +485,16 @@
sprintf(temp_boundry, "%s", "--");
sprintf(temp_boundry, "%s", mime_boundary);
sprintf(temp_boundry, "%s", "--");
- if (body_mime && AXIS2_STRSTR(body_mime, temp_boundry))
+ if (body_mime && axis2_strstr(body_mime, temp_boundry))
+ {
break;
+ }
}
if (body_mime)
{
AXIS2_FREE(env->allocator, body_mime);
- body_mime = NULL;
}
body_mime = temp_body_mime;
@@ -521,41 +506,35 @@
if (body_mime)
{
AXIS2_FREE(env->allocator, body_mime);
- body_mime = NULL;
}
if (root_mime)
{
AXIS2_FREE(env->allocator, root_mime);
- root_mime = NULL;
}
AXIS2_FREE(env->allocator, buffer);
- buffer = NULL;
return mime_parser_impl->mime_parts_map;
}
axis2_hash_t* AXIS2_CALL
axiom_mime_parser_get_mime_parts_map(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(mime_parser)->mime_parts_map;
}
int AXIS2_CALL
axiom_mime_parser_get_soap_body_len(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(mime_parser)->soap_body_len;
}
axis2_char_t* AXIS2_CALL
axiom_mime_parser_get_soap_body_str(axiom_mime_parser_t *mime_parser,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(mime_parser)->soap_body_str;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_attribute.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_attribute.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_attribute.c Sat Mar 17 00:24:29 2007
@@ -57,7 +57,7 @@
attribute->ns = NULL;
attribute->qname = NULL;
- attribute->localname = (axis2_char_t*) AXIS2_STRDUP(localname, env);
+ attribute->localname = (axis2_char_t*) axis2_strdup(localname, env);
if (!(attribute->localname))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -66,7 +66,7 @@
}
if (value)
{
- attribute->value = (axis2_char_t*) AXIS2_STRDUP(value, env);
+ attribute->value = (axis2_char_t*) axis2_strdup(value, env);
if (!(attribute->value))
{
AXIS2_ERROR_SET(env->error , AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -104,7 +104,7 @@
}
if (attribute->qname)
{
- AXIS2_QNAME_FREE(attribute->qname, env);
+ axis2_qname_free(attribute->qname, env);
}
AXIS2_FREE(env->allocator, attribute);
@@ -167,7 +167,7 @@
uri = axiom_namespace_get_uri(attribute->ns, env);
prefix = axiom_namespace_get_prefix(attribute->ns, env);
- if ((uri) && (NULL != prefix) && (AXIS2_STRCMP(prefix, "") != 0))
+ if ((uri) && (NULL != prefix) && (axis2_strcmp(prefix, "") != 0))
{
status = axiom_output_write(om_output, env, AXIOM_ATTRIBUTE, 4,
attribute->localname,
@@ -225,7 +225,7 @@
AXIS2_FREE(env->allocator, attribute->localname);
}
- attribute->localname = (axis2_char_t*)AXIS2_STRDUP(localname, env);
+ attribute->localname = (axis2_char_t*)axis2_strdup(localname, env);
if (!(attribute->localname))
{
@@ -249,7 +249,7 @@
AXIS2_FREE(env->allocator, attribute->value);
}
- attribute->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ attribute->value = (axis2_char_t*)axis2_strdup(value, env);
if (!(attribute->value))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Sat Mar 17 00:24:29 2007
@@ -63,7 +63,7 @@
iterator->current_child = current_child;
if (given_qname)
{
- iterator->given_qname = AXIS2_QNAME_CLONE(given_qname, env);
+ iterator->given_qname = axis2_qname_clone(given_qname, env);
if (!(iterator->given_qname))
{
axiom_children_qname_iterator_free(iterator, env);
@@ -82,7 +82,7 @@
if (iterator->given_qname)
{
- AXIS2_QNAME_FREE(iterator->given_qname, env);
+ axis2_qname_free(iterator->given_qname, env);
}
AXIS2_FREE(env->allocator, iterator);
return AXIS2_SUCCESS;
@@ -204,22 +204,22 @@
return AXIS2_TRUE;
if (qname_to_match)
{
- match_lpart = AXIS2_QNAME_GET_LOCALPART(qname_to_match, env);
- match_nsuri = AXIS2_QNAME_GET_URI(qname_to_match, env);
+ match_lpart = axis2_qname_get_localpart(qname_to_match, env);
+ match_nsuri = axis2_qname_get_uri(qname_to_match, env);
}
if (element_qname)
{
- ele_lpart = AXIS2_QNAME_GET_LOCALPART(element_qname, env);
- ele_nsuri = AXIS2_QNAME_GET_URI(element_qname, env);
+ ele_lpart = axis2_qname_get_localpart(element_qname, env);
+ ele_nsuri = axis2_qname_get_localpart(element_qname, env);
}
lparts_match = (!match_lpart ||
- (AXIS2_STRCMP(match_lpart, "") == 0) ||
- (element_qname && (AXIS2_STRCMP(ele_lpart, match_lpart) == 0)));
+ (axis2_strcmp(match_lpart, "") == 0) ||
+ (element_qname && (axis2_strcmp(ele_lpart, match_lpart) == 0)));
- uris_match = (!match_nsuri || (AXIS2_STRCMP(match_nsuri, "") == 0) ||
- (element_qname && (AXIS2_STRCMP(ele_nsuri, match_nsuri) == 0)));
+ uris_match = (!match_nsuri || (axis2_strcmp(match_nsuri, "") == 0) ||
+ (element_qname && (axis2_strcmp(ele_nsuri, match_nsuri) == 0)));
return lparts_match && uris_match;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_with_specific_attribute_iterator.c Sat Mar 17 00:24:29 2007
@@ -94,7 +94,7 @@
iterator_impl->next_called = AXIS2_FALSE;
iterator_impl->remove_called = AXIS2_FALSE;
- iterator_impl->attr_qname = AXIS2_QNAME_CLONE(attr_qname, env);
+ iterator_impl->attr_qname = axis2_qname_clone(attr_qname, env);
iterator_impl->attr_value = attr_value;
iterator_impl->detach = detach;
@@ -135,7 +135,7 @@
qname_iter_impl = AXIS2_INTF_TO_IMPL(iterator);
if (qname_iter_impl->attr_qname)
{
- AXIS2_QNAME_FREE(qname_iter_impl->attr_qname, env);
+ axis2_qname_free(qname_iter_impl->attr_qname, env);
qname_iter_impl->attr_qname = NULL;
}
if (iterator->ops)
@@ -211,7 +211,7 @@
iterator_impl->attr_qname);
break;
if (om_attr &&
- (AXIS2_STRCMP(axiom_attribute_get_value(om_attr, env),
+ (axis2_strcmp(axiom_attribute_get_value(om_attr, env),
iterator_impl->attr_value) == 0))
{
matching_node_found = AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_comment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_comment.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_comment.c Sat Mar 17 00:24:29 2007
@@ -56,7 +56,7 @@
if (value)
{
- comment->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ comment->value = (axis2_char_t*)axis2_strdup(value, env);
if (!comment->value)
{
AXIS2_FREE(env->allocator, comment);
@@ -111,7 +111,7 @@
AXIS2_FREE(env->allocator, comment->value);
}
- comment->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ comment->value = (axis2_char_t*)axis2_strdup(value, env);
if (!comment->value)
{
Modified: webservices/axis2/trunk/c/axiom/src/om/om_doctype.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_doctype.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_doctype.c Sat Mar 17 00:24:29 2007
@@ -56,7 +56,7 @@
if (value)
{
- doctype->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ doctype->value = (axis2_char_t*)axis2_strdup(value, env);
if (!doctype->value)
{
AXIS2_FREE(env->allocator, doctype);
@@ -100,7 +100,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
- om_doctype->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ om_doctype->value = (axis2_char_t*)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Sat Mar 17 00:24:29 2007
@@ -91,7 +91,7 @@
element->text_value = NULL;
element->next_ns_prefix_number = 0;
- element->localname = (axis2_char_t *) AXIS2_STRDUP(localname, env);
+ element->localname = (axis2_char_t *) axis2_strdup(localname, env);
if (!element->localname)
{
AXIS2_FREE(env->allocator, element);
@@ -125,7 +125,7 @@
element->ns = ns;
}
}
- if (prefix && AXIS2_STRCMP(prefix, "") == 0)
+ if (prefix && axis2_strcmp(prefix, "") == 0)
{
element->ns = NULL;
}
@@ -149,7 +149,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
return NULL;
}
- localpart = AXIS2_QNAME_GET_LOCALPART(qname, env);
+ localpart = axis2_qname_get_localpart(qname, env);
if (!localpart)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -169,14 +169,14 @@
axiom_namespace_t *ns = NULL;
om_element = ((axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT((*node), env));
- temp_nsuri = AXIS2_QNAME_GET_URI(qname, env);
- temp_prefix = AXIS2_QNAME_GET_PREFIX(qname, env);
+ temp_nsuri = axis2_qname_get_uri(qname, env);
+ temp_prefix = axis2_qname_get_prefix(qname, env);
if (!om_element)
{
return NULL;
}
- if ((!temp_nsuri) || (AXIS2_STRCMP(temp_nsuri, "") == 0))
+ if ((!temp_nsuri) || (axis2_strcmp(temp_nsuri, "") == 0))
{
/** no namespace uri is available in given qname
no need to bother about it
@@ -236,7 +236,7 @@
{
void *ns = NULL;
- if (!prefix || AXIS2_STRCMP(prefix, "") == 0)
+ if (!prefix || axis2_strcmp(prefix, "") == 0)
{
/** check for a default namepsace */
axiom_namespace_t *default_ns = NULL;
@@ -249,7 +249,7 @@
axis2_char_t *default_uri = NULL;
default_uri = axiom_namespace_get_uri(default_ns, env);
- if (default_uri && AXIS2_STRCMP(uri, default_uri) == 0)
+ if (default_uri && axis2_strcmp(uri, default_uri) == 0)
{
return default_ns;
}
@@ -266,7 +266,7 @@
temp_ns = (axiom_namespace_t *)ns;
temp_nsuri = axiom_namespace_get_uri(temp_ns, env);
- if (temp_nsuri && (AXIS2_STRCMP(temp_nsuri, uri) == 0))
+ if (temp_nsuri && (axis2_strcmp(temp_nsuri, uri) == 0))
{
/** namespace uri matches , so free hashindex and return ns*/
AXIS2_FREE(env->allocator, hashindex);
@@ -293,7 +293,7 @@
found_uri = axiom_namespace_get_uri(found_ns, env);
/* TODO fix this
- if( ( found_uri) && AXIS2_STRCMP(found_uri, uri) == 0)
+ if( ( found_uri) && axis2_strcmp(found_uri, uri) == 0)
{
printf("\n furi %s real uri %s %s\n ", found_uri, uri, prefix);
return found_ns;
@@ -450,7 +450,7 @@
{
return NULL;
}
- if (!prefix || AXIS2_STRCMP(prefix, "") == 0)
+ if (!prefix || axis2_strcmp(prefix, "") == 0)
{
/** prefix null iterate the namespace hash for matching uri */
for (hash_index = axis2_hash_first(om_element->namespaces, env);
@@ -464,7 +464,7 @@
temp_ns = (axiom_namespace_t *)(ns);
temp_nsuri = axiom_namespace_get_uri(temp_ns, env);
- if (temp_nsuri && AXIS2_STRCMP(temp_nsuri, uri) == 0)
+ if (temp_nsuri && axis2_strcmp(temp_nsuri, uri) == 0)
{
AXIS2_FREE(env->allocator, hash_index);
return temp_ns;
@@ -485,7 +485,7 @@
axis2_char_t *found_uri = NULL;
found_ns = (axiom_namespace_t *) ns;
found_uri = axiom_namespace_get_uri(found_ns, env);
- if (found_uri && AXIS2_STRCMP(found_uri, uri) == 0)
+ if (found_uri && axis2_strcmp(found_uri, uri) == 0)
{
return found_ns;
}
@@ -507,11 +507,11 @@
return NULL;
}
- if (AXIS2_QNAME_GET_URI(qname, env))
+ if (axis2_qname_get_uri(qname, env))
{
return axiom_element_find_namespace(element, env, node,
- AXIS2_QNAME_GET_URI(qname, env),
- AXIS2_QNAME_GET_PREFIX(qname, env));
+ axis2_qname_get_uri(qname, env),
+ axis2_qname_get_prefix(qname, env));
}
else
{
@@ -565,7 +565,7 @@
qname = axiom_attribute_get_qname(attribute, env);
if (qname)
{
- axis2_char_t *name = AXIS2_QNAME_TO_STRING(qname, env);
+ axis2_char_t *name = axis2_qname_to_string(qname, env);
axis2_hash_set(om_element->attributes,
name, AXIS2_HASH_KEY_STRING,
attribute);
@@ -584,7 +584,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = AXIS2_QNAME_TO_STRING(qname, env);
+ name = axis2_qname_to_string(qname, env);
if ((om_element->attributes) && name)
{
@@ -648,7 +648,7 @@
}
if (om_element->qname)
{
- AXIS2_QNAME_FREE(om_element->qname, env);
+ axis2_qname_free(om_element->qname, env);
}
if (om_element->children_iter)
{
@@ -690,7 +690,7 @@
uri = axiom_namespace_get_uri(om_element->ns, env);
prefix = axiom_namespace_get_prefix(om_element->ns, env);
- if ((uri) && (prefix) && (AXIS2_STRCMP(prefix, "") != 0))
+ if ((uri) && (prefix) && (axis2_strcmp(prefix, "") != 0))
{
status = axiom_output_write(om_output, env,
AXIOM_ELEMENT, 3, om_element->localname,
@@ -786,7 +786,7 @@
AXIS2_FREE(env->allocator, om_element->localname);
om_element->localname = NULL;
}
- om_element->localname = (axis2_char_t*)AXIS2_STRDUP(localname, env);
+ om_element->localname = (axis2_char_t*)axis2_strdup(localname, env);
if (!(om_element->localname))
{
return AXIS2_FAILURE;
@@ -1005,7 +1005,7 @@
if (qname && (om_element->attributes))
{
axis2_char_t *name = NULL;
- name = AXIS2_QNAME_TO_STRING(qname, env);
+ name = axis2_qname_to_string(qname, env);
if (name)
{
axis2_hash_set(om_element->attributes, name,
@@ -1078,10 +1078,10 @@
if (text_node)
{
temp_text = axiom_text_get_value(text_node, env);
- if (dest && temp_text && AXIS2_STRCMP(temp_text, "") != 0)
+ if (dest && temp_text && axis2_strcmp(temp_text, "") != 0)
{
- dest_len = AXIS2_STRLEN(dest);
- curr_len = dest_len + AXIS2_STRLEN(temp_text);
+ dest_len = axis2_strlen(dest);
+ curr_len = dest_len + axis2_strlen(temp_text);
temp_dest = AXIS2_MALLOC(env->allocator,
(curr_len + 1) * sizeof(axis2_char_t));
@@ -1095,9 +1095,9 @@
dest = NULL;
dest = temp_dest;
}
- else if (!dest && temp_text && AXIS2_STRCMP(temp_text, "") != 0)
+ else if (!dest && temp_text && axis2_strcmp(temp_text, "") != 0)
{
- dest = AXIS2_STRDUP(temp_text, env);
+ dest = axis2_strdup(temp_text, env);
}
}
}
@@ -1274,7 +1274,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, uri, NULL);
- if (AXIS2_STRCMP(uri, "") == 0)
+ if (axis2_strcmp(uri, "") == 0)
{
return NULL;
}
@@ -1352,7 +1352,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, qname, NULL);
- name = AXIS2_QNAME_TO_STRING(qname, env);
+ name = axis2_qname_to_string(qname, env);
if ((om_element->attributes) && (NULL != name))
{
@@ -1424,7 +1424,7 @@
axiom_attribute_set_namespace(cloned_attr, env, cloned_ns);
}
qn = axiom_attribute_get_qname(cloned_attr, env);
- key = AXIS2_QNAME_TO_STRING(qn, env);
+ key = axis2_qname_to_string(qn, env);
axis2_hash_set(ht_cloned, key, AXIS2_HASH_KEY_STRING, cloned_attr);
}
val = NULL;
@@ -1474,8 +1474,8 @@
if (prefix)
{
axis2_char_t *tmp_val = NULL;
- tmp_val = AXIS2_STRACAT(prefix, ":", env);
- attr_qn_str = AXIS2_STRACAT(tmp_val, this_attr_name, env);
+ tmp_val = axis2_stracat(prefix, ":", env);
+ attr_qn_str = axis2_stracat(tmp_val, this_attr_name, env);
if (tmp_val)
{
AXIS2_FREE(env->allocator, tmp_val);
@@ -1485,10 +1485,10 @@
}
else
{
- attr_qn_str = AXIS2_STRDUP(this_attr_name, env);
+ attr_qn_str = axis2_strdup(this_attr_name, env);
}
- if (attr_qn_str && AXIS2_STRCMP(attr_qn_str, attr_name) == 0)
+ if (attr_qn_str && axis2_strcmp(attr_qn_str, attr_name) == 0)
{
AXIS2_FREE(env->allocator, attr_qn_str);
attr_qn_str = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_namespace.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_namespace.c Sat Mar 17 00:24:29 2007
@@ -57,7 +57,7 @@
om_namespace->uri = NULL;
om_namespace->key = NULL;
- om_namespace->uri = (axis2_char_t *) AXIS2_STRDUP(uri, env);
+ om_namespace->uri = (axis2_char_t *) axis2_strdup(uri, env);
if (!om_namespace->uri)
{
AXIS2_FREE(env->allocator, om_namespace);
@@ -67,7 +67,7 @@
if (prefix)
{
- om_namespace->prefix = (axis2_char_t *) AXIS2_STRDUP(prefix, env);
+ om_namespace->prefix = (axis2_char_t *) axis2_strdup(prefix, env);
if (!om_namespace->prefix)
{
AXIS2_FREE(env->allocator, om_namespace);
@@ -165,7 +165,7 @@
AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
if (om_namespace->uri && NULL != om_namespace->prefix &&
- AXIS2_STRCMP(om_namespace->prefix, "") != 0)
+ axis2_strcmp(om_namespace->prefix, "") != 0)
{
status = axiom_output_write(om_output, env, AXIOM_NAMESPACE,
2, om_namespace->prefix,
@@ -224,8 +224,8 @@
}
if ((om_namespace->uri) && (NULL != om_namespace->prefix))
{
- temp_str = AXIS2_STRACAT(om_namespace->uri, "|", env);
- om_namespace->key = AXIS2_STRACAT(temp_str, om_namespace->prefix, env);
+ temp_str = axis2_stracat(om_namespace->uri, "|", env);
+ om_namespace->key = axis2_stracat(temp_str, om_namespace->prefix, env);
if (temp_str)
{
AXIS2_FREE(env->allocator, temp_str);
@@ -234,7 +234,7 @@
}
else if ((om_namespace->uri) && !(om_namespace->prefix))
{
- om_namespace->key = AXIS2_STRDUP(om_namespace->uri, env);
+ om_namespace->key = axis2_strdup (om_namespace->uri, env);
if (!(om_namespace->key))
{
return NULL;
@@ -258,7 +258,7 @@
om_namespace->uri = NULL;
}
- om_namespace->uri = AXIS2_STRDUP(uri, env);
+ om_namespace->uri = axis2_strdup(uri, env);
if (!(om_namespace->uri))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Sat Mar 17 00:24:29 2007
@@ -192,7 +192,7 @@
om_output->xml_version = NULL;
}
- om_output->xml_version = AXIS2_STRDUP(xml_version, env);
+ om_output->xml_version = axis2_strdup(xml_version, env);
if (!om_output->xml_version)
{
return AXIS2_FAILURE;
@@ -330,9 +330,9 @@
sprintf(id, "%d", om_output->next_id);
- temp_str = AXIS2_STRACAT(id, ".", env);
- temp_str1 = AXIS2_STRACAT(temp_str, uuid, env);
- om_output->next_content_id = AXIS2_STRACAT(temp_str1, "@apache.org", env);
+ temp_str = axis2_stracat(id, ".", env);
+ temp_str1 = axis2_stracat(temp_str, uuid, env);
+ om_output->next_content_id = axis2_stracat(temp_str1, "@apache.org", env);
if (temp_str)
{
AXIS2_FREE(env->allocator, temp_str);
@@ -362,10 +362,10 @@
{
uuid = axis2_uuid_gen(env);
- temp_str = AXIS2_STRACAT("0.", uuid, env);
+ temp_str = axis2_stracat("0.", uuid, env);
om_output->root_content_id =
- AXIS2_STRACAT(temp_str, "@apache.org", env);
+ axis2_stracat(temp_str, "@apache.org", env);
if (temp_str)
{
@@ -391,7 +391,7 @@
{
uuid = axis2_uuid_gen(env);
- om_output->mime_boundary = AXIS2_STRACAT("MIMEBoundary", uuid, env);
+ om_output->mime_boundary = axis2_stracat("MIMEBoundary", uuid, env);
if (uuid)
{
AXIS2_FREE(env->allocator, uuid);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c Sat Mar 17 00:24:29 2007
@@ -66,7 +66,7 @@
if (value)
{
- processing_instruction->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ processing_instruction->value = (axis2_char_t*)axis2_strdup(value, env);
if (!processing_instruction->value)
{
AXIS2_FREE(env->allocator, processing_instruction);
@@ -80,7 +80,7 @@
if (target)
{
- processing_instruction->target = (axis2_char_t*) AXIS2_STRDUP(target, env);
+ processing_instruction->target = (axis2_char_t*) axis2_strdup(target, env);
if (!processing_instruction->target)
{
AXIS2_FREE(env->allocator, processing_instruction->value);
@@ -129,7 +129,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
- om_pi->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ om_pi->value = (axis2_char_t*)axis2_strdup(value, env);
return AXIS2_SUCCESS;
}
@@ -141,7 +141,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, target, AXIS2_FAILURE);
- om_pi->target = (axis2_char_t*)AXIS2_STRDUP(target, env);
+ om_pi->target = (axis2_char_t*)axis2_strdup(target, env);
return AXIS2_SUCCESS;
}
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?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Sat Mar 17 00:24:29 2007
@@ -131,7 +131,7 @@
ns = axiom_element_find_namespace(om_ele ,
env , element_node, uri, prefix);
- /* newly added to handle "xml:*" attributes" (AXIS2_STRCMP(prefix, "xml") == 0) && */
+ /* newly added to handle "xml:*" attributes" (axis2_strcmp(prefix, "xml") == 0) && */
if (!ns)
{
ns = axiom_namespace_create(env, uri, prefix);
@@ -299,7 +299,7 @@
temp_ns_uri = AXIOM_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(
om_builder->parser, env , i);
- if (!temp_ns_prefix || AXIS2_STRCMP(temp_ns_prefix, "xmlns") == 0)
+ if (!temp_ns_prefix || axis2_strcmp(temp_ns_prefix, "xmlns") == 0)
{
/** default namespace case */
/** !temp_ns_prefix is for guththila */
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Sat Mar 17 00:24:29 2007
@@ -95,7 +95,7 @@
if (value)
{
- om_text->value = (axis2_char_t *) AXIS2_STRDUP(value, env);
+ om_text->value = (axis2_char_t *) axis2_strdup(value, env);
}
axiom_node_set_data_element((*node), env, om_text);
@@ -198,11 +198,11 @@
axis2_char_t *content_id = axiom_output_get_next_content_id(om_output, env);
if (content_id)
{
- om_text->content_id = AXIS2_STRDUP(content_id, env);
+ om_text->content_id = axis2_strdup(content_id, env);
}
}
- attribute_value = AXIS2_STRACAT("cid:", om_text->content_id, env);
+ attribute_value = axis2_stracat("cid:", om_text->content_id, env);
/*send binary as MTOM optimised*/
if (om_text->om_attribute)
@@ -252,7 +252,7 @@
om_text->value = NULL;
}
- om_text->value = (axis2_char_t*)AXIS2_STRDUP(value, env);
+ om_text->value = (axis2_char_t*)axis2_strdup(value, env);
if (!om_text->value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
@@ -282,7 +282,7 @@
{
AXIS2_FREE(env->allocator, om_text->mime_type);
}
- om_text->mime_type = (axis2_char_t*)AXIS2_STRDUP(mime_type, env);
+ om_text->mime_type = (axis2_char_t*)axis2_strdup(mime_type, env);
return AXIS2_SUCCESS;
}
@@ -347,7 +347,7 @@
{
AXIS2_FREE(env->allocator, om_text->content_id);
}
- om_text->content_id = (axis2_char_t*)AXIS2_STRDUP(content_id, env);
+ om_text->content_id = (axis2_char_t*)axis2_strdup(content_id, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Sat Mar 17 00:24:29 2007
@@ -868,7 +868,7 @@
{
axis2_libxml2_reader_wrapper_impl_t *parser_impl = NULL;
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- if (!prefix || AXIS2_STRCMP(prefix, "") == 0)
+ if (!prefix || axis2_strcmp(prefix, "") == 0)
{
return NULL;
}
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?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- 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 Sat Mar 17 00:24:29 2007
@@ -345,11 +345,11 @@
if (encoding)
{
- writer_impl->encoding = AXIS2_STRDUP(encoding , env);
+ writer_impl->encoding = axis2_strdup(encoding , env);
}
else
{
- writer_impl->encoding = AXIS2_STRDUP(ENCODING, env);
+ writer_impl->encoding = axis2_strdup(ENCODING, env);
}
writer_impl->uri_prefix_map = axis2_hash_make(env);
@@ -438,11 +438,11 @@
if (encoding)
{
- writer_impl->encoding = AXIS2_STRDUP(encoding , env);
+ writer_impl->encoding = axis2_strdup(encoding , env);
}
else
{
- writer_impl->encoding = AXIS2_STRDUP(ENCODING, env);
+ writer_impl->encoding = axis2_strdup(ENCODING, env);
}
writer_impl->uri_prefix_map = axis2_hash_make(env);
@@ -578,7 +578,7 @@
}
if (writer_impl->stack)
{
- AXIS2_STACK_FREE(writer_impl->stack, env);
+ axis2_stack_free(writer_impl->stack, env);
writer_impl->stack = NULL;
}
if (writer_impl->default_lang_namespace)
@@ -930,15 +930,15 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (prefix && (AXIS2_STRCMP(prefix, "") != 0))
+ if (prefix && (axis2_strcmp(prefix, "") != 0))
{
xmlnsprefix = (axis2_char_t*)AXIS2_MALLOC(env->allocator,
- (sizeof(char) * (AXIS2_STRLEN(prefix) + 7)));
+ (sizeof(char) * (axis2_strlen(prefix) + 7)));
sprintf(xmlnsprefix, "xmlns:%s", prefix);
}
else
{
- xmlnsprefix = AXIS2_STRDUP("xmlns", env);
+ xmlnsprefix = axis2_strdup("xmlns", env);
}
status = xmlTextWriterWriteAttribute(writer_impl->xml_writer,
@@ -1203,7 +1203,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 || AXIS2_STRCMP(uri, "") == 0)
+ if (!uri || axis2_strcmp(uri, "") == 0)
{
return NULL;
}
@@ -1225,7 +1225,7 @@
AXIS2_PARAM_CHECK(env->error, prefix, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (AXIS2_STRCMP(uri, "") == 0)
+ if (axis2_strcmp(uri, "") == 0)
{
return AXIS2_FAILURE;
}
@@ -1248,7 +1248,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, uri, AXIS2_FAILURE);
- if (AXIS2_STRCMP(uri, "") == 0)
+ if (axis2_strcmp(uri, "") == 0)
{
return AXIS2_FAILURE;
}
@@ -1336,7 +1336,7 @@
axis2_char_t key[1024];
const axis2_char_t *temp_prefix = NULL;
writer_impl = AXIS2_INTF_TO_IMPL(writer);
- if (!prefix || AXIS2_STRCMP(prefix, "") == 0)
+ if (!prefix || axis2_strcmp(prefix, "") == 0)
{
temp_prefix = "default";
}
@@ -1348,7 +1348,7 @@
if (writer_impl->stack)
{
current_list = (axis2_array_list_t *)
- AXIS2_STACK_GET(writer_impl->stack, env);
+ axis2_stack_get(writer_impl->stack, env);
if (current_list)
{
@@ -1447,28 +1447,28 @@
up_element->uri = NULL;
up_element->real_prefix = NULL;
- up_element->uri = AXIS2_STRDUP(uri, env);
+ up_element->uri = axis2_strdup(uri, env);
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 = AXIS2_STRDUP(prefix, env);
+ up_element->prefix = axis2_strdup(prefix, env);
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 = AXIS2_STRDUP(key, env);
+ up_element->key = axis2_strdup(key, env);
if (key && !up_element->key)
{
uri_prefix_element_free(up_element, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- up_element->real_prefix = AXIS2_STRDUP(real_prefix, env);
+ up_element->real_prefix = axis2_strdup(real_prefix, env);
return up_element;
}
@@ -1501,7 +1501,7 @@
{
return NULL;
}
- size = AXIS2_STACK_SIZE(writer_impl->stack, env);
+ size = axis2_stack_size(writer_impl->stack, env);
if (size <= 0)
{
return NULL;
@@ -1511,7 +1511,7 @@
{
axis2_array_list_t *context = NULL;
void *value = NULL;
- value = AXIS2_STACK_GET_AT(writer_impl->stack, env, i);
+ value = axis2_stack_get_at(writer_impl->stack, env, i);
if (value)
{
uri_prefix_element_t *up_ele = NULL;
@@ -1548,7 +1548,7 @@
if (value)
{
ele = (uri_prefix_element_t*)value;
- if (ele->uri && AXIS2_STRCMP(uri, ele->uri))
+ if (ele->uri && axis2_strcmp(uri, ele->uri))
{
return ele;
}
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?view=diff&rev=519254&r1=519253&r2=519254
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.c Sat Mar 17 00:24:29 2007
@@ -138,7 +138,7 @@
axiom_node_t *fault_value_node = NULL;
axiom_element_t *fault_value_ele = NULL;
- if (AXIS2_STRCMP(ele_localname, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
+ if (axis2_strcmp(ele_localname, AXIOM_SOAP11_SOAP_FAULT_CODE_LOCAL_NAME) == 0)
{
axis2_status_t status = AXIS2_SUCCESS;
@@ -187,7 +187,7 @@
env, (element_level - 1));
builder_helper->fault_code_present = AXIS2_TRUE;
}
- else if (AXIS2_STRCMP(AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME, ele_localname) == 0)
+ else if (axis2_strcmp(AXIOM_SOAP11_SOAP_FAULT_STRING_LOCAL_NAME, ele_localname) == 0)
{
axiom_soap_fault_reason_t *fault_reason = NULL;
@@ -235,7 +235,7 @@
builder_helper->fault_string_present = AXIS2_TRUE;
}
- else if (AXIS2_STRCMP(AXIOM_SOAP11_SOAP_FAULT_ACTOR_LOCAL_NAME, ele_localname) == 0)
+ else if (axis2_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);
@@ -254,7 +254,7 @@
if(status == AXIS2_FAILURE)
return AXIS2_FAILURE;*/
}
- else if (AXIS2_STRCMP(AXIOM_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME, ele_localname) == 0)
+ else if (axis2_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);
@@ -287,7 +287,7 @@
if (!parent_localname)
return AXIS2_FAILURE;
- if (AXIS2_STRCMP(parent_localname, AXIOM_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME) == 0)
+ if (axis2_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);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org