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 sa...@apache.org on 2007/04/02 04:58:34 UTC
svn commit: r524716 - in /webservices/axis2/trunk/c:
axiom/include/axiom_data_handler.h axiom/src/attachments/mime_body_part.c
axiom/src/attachments/mime_output.c axiom/src/attachments/mime_parser.c
axiom/src/om/om_text.c samples/server/mtom/mtom.c
Author: samisa
Date: Sun Apr 1 19:58:33 2007
New Revision: 524716
URL: http://svn.apache.org/viewvc?view=rev&rev=524716
Log:
Removed macros form data_handler
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
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_text.c
webservices/axis2/trunk/c/samples/server/mtom/mtom.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=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Sun Apr 1 19:58:33 2007
@@ -93,27 +93,6 @@
const axis2_char_t *file_name,
const axis2_char_t *mime_type);
-#define AXIOM_DATA_HANDLER_FREE(data_handler, env) \
- axiom_data_handler_free (data_handler, env)
-
-#define AXIOM_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env) \
- axiom_data_handler_get_content_type (data_handler, env)
-
-#define AXIOM_DATA_HANDLER_GET_INPUT_STREAM(data_handler, env) \
- axiom_data_handler_get_input_stream (data_handler, env)
-
-#define AXIOM_DATA_HANDLER_READ_FROM(data_handler, env, output_stream, output_stream_size) \
- axiom_data_handler_read_from (data_handler, env, output_stream, output_stream_size)
-
-#define AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env, input_stream, input_stream_size) \
- axiom_data_handler_set_binary_data (data_handler, env, input_stream, input_stream_size)
-
-#define AXIOM_DATA_HANDLER_WRITE_TO(data_handler, env) \
- axiom_data_handler_write_to (data_handler, env)
-
-#define AXIOM_DATA_HANDLER_SET_FILE_NAME(data_handler, env, file_name) \
- axiom_data_handler_set_file_name (data_handler, env, file_name)
-
/** @} */
#ifdef __cplusplus
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=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c Sun Apr 1 19:58:33 2007
@@ -178,7 +178,7 @@
*/
if (mime_body_part->data_handler)
{
- status = AXIOM_DATA_HANDLER_READ_FROM(mime_body_part->data_handler, env,
+ status = axiom_data_handler_read_from(mime_body_part->data_handler, env,
&data_handler_stream, &data_handler_stream_size);
if (status == AXIS2_FAILURE)
{
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=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Sun Apr 1 19:58:33 2007
@@ -359,7 +359,7 @@
if (data_handler)
{
- content_type = AXIOM_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env);
+ content_type = axiom_data_handler_get_content_type(data_handler, env);
}
AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
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=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Sun Apr 1 19:58:33 2007
@@ -414,7 +414,7 @@
AXIS2_FREE(env->allocator, type);
- AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env,
+ axiom_data_handler_set_binary_data(data_handler, env,
mime_binary, mime_binary_len);
axutil_hash_set(mime_parser->mime_parts_map, mime_id,
AXIS2_HASH_KEY_STRING, data_handler);
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=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Sun Apr 1 19:58:33 2007
@@ -159,7 +159,7 @@
if (om_text->data_handler)
{
- AXIOM_DATA_HANDLER_FREE(om_text->data_handler, env);
+ axiom_data_handler_free(om_text->data_handler, env);
}
AXIS2_FREE(env->allocator, om_text);
@@ -496,7 +496,7 @@
{
int encoded_len = 0;
axis2_char_t *encoded_str = NULL;
- AXIOM_DATA_HANDLER_READ_FROM(om_text->data_handler, env,
+ axiom_data_handler_read_from(om_text->data_handler, env,
&data_handler_stream, &data_handler_stream_size);
if (data_handler_stream)
{
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom.c?view=diff&rev=524716&r1=524715&r2=524716
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom.c Sun Apr 1 19:58:33 2007
@@ -86,8 +86,8 @@
data_handler = axiom_text_get_data_handler(bin_text, env);
if (data_handler)
{
- AXIOM_DATA_HANDLER_SET_FILE_NAME(data_handler, env, text_str);
- AXIOM_DATA_HANDLER_WRITE_TO(data_handler, env);
+ axiom_data_handler_set_file_name(data_handler, env, text_str);
+ axiom_data_handler_write_to(data_handler, env);
ret_node = build_om_programatically(env, text_str);
}
}
@@ -107,8 +107,8 @@
axutil_base64_decode_binary((unsigned char*)plain_binary,
base64text);
data_handler = axiom_data_handler_create(env, text_str, NULL);
- AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env, plain_binary, plain_binary_len);
- AXIOM_DATA_HANDLER_WRITE_TO(data_handler, env);
+ axiom_data_handler_set_binary_data(data_handler, env, plain_binary, plain_binary_len);
+ axiom_data_handler_write_to(data_handler, env);
ret_node = build_om_programatically(env, text_str);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org