Author: nadiramra
Date: Tue Nov 10 17:44:03 2015
New Revision: 1713706
URL: http://svn.apache.org/viewvc?rev=1713706&view=rev
Log:
Simplify/cleanup code
Modified:
axis/axis2/c/core/trunk/axiom/src/attachments/axiom_mime_body_part.h
axis/axis2/c/core/trunk/axiom/src/attachments/mime_body_part.c
axis/axis2/c/core/trunk/axiom/src/attachments/mime_part.c
Modified: axis/axis2/c/core/trunk/axiom/src/attachments/axiom_mime_body_part.h
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/attachments/axiom_mime_body_part.h?rev=1713706&r1=1713705&r2=1713706&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/attachments/axiom_mime_body_part.h
(original)
+++ axis/axis2/c/core/trunk/axiom/src/attachments/axiom_mime_body_part.h Tue
Nov 10 17:44:03 2015
@@ -100,19 +100,6 @@ extern "C"
const axutil_env_t *env,
axiom_text_t *text);
-
-#define AXIOM_MIME_BODY_PART_FREE(mime_body_part, env) \
- axiom_mime_body_part_free (mime_body_part, env)
-
-#define AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env, name, value) \
- axiom_mime_body_part_add_header (mime_body_part, env, name, value)
-
-#define AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
data_handler) \
- axiom_mime_body_part_set_data_handler (mime_body_part, env, data_handler)
-
-#define AXIOM_MIME_BODY_PART_WRITE_TO(mime_body_part, env, output_stream,
output_stream_size) \
- axiom_mime_body_part_write_to (mime_body_part, env, output_stream,
output_stream_size)
-
/** @} */
#ifdef __cplusplus
Modified: axis/axis2/c/core/trunk/axiom/src/attachments/mime_body_part.c
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/attachments/mime_body_part.c?rev=1713706&r1=1713705&r2=1713706&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/attachments/mime_body_part.c (original)
+++ axis/axis2/c/core/trunk/axiom/src/attachments/mime_body_part.c Tue Nov 10
17:44:03 2015
@@ -94,7 +94,7 @@ axiom_mime_body_part_create_from_om_text
content_type = axiom_data_handler_get_content_type(data_handler, env);
}
- AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env, data_handler);
+ axiom_mime_body_part_set_data_handler(mime_body_part, env, data_handler);
content_id = (axis2_char_t *)"<";
content_id = axutil_stracat(env, content_id,
axiom_text_get_content_id(text, env));
temp_content_id = axutil_stracat(env, content_id, ">");
@@ -103,14 +103,14 @@ axiom_mime_body_part_create_from_om_text
content_id = temp_content_id;
/* Adding the content-id */
- AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_ID, content_id);
+ axiom_mime_body_part_add_header(mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_ID, content_id);
/* Adding the content-type */
- AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TYPE,
+ axiom_mime_body_part_add_header(mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TYPE,
axutil_strdup(env, content_type));
/* Adding the content-transfer encoding */
- AXIOM_MIME_BODY_PART_ADD_HEADER(mime_body_part, env,
+ axiom_mime_body_part_add_header(mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TRANSFER_ENCODING, axutil_strdup(env,
AXIOM_MIME_CONTENT_TRANSFER_ENCODING_BINARY));
Modified: axis/axis2/c/core/trunk/axiom/src/attachments/mime_part.c
URL:
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/src/attachments/mime_part.c?rev=1713706&r1=1713705&r2=1713706&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/src/attachments/mime_part.c (original)
+++ axis/axis2/c/core/trunk/axiom/src/attachments/mime_part.c Tue Nov 10
17:44:03 2015
@@ -430,12 +430,12 @@ axiom_mime_part_create_part_list(
temp_header_value = axutil_stracat(env, header_value, "\";");
AXIS2_FREE(env->allocator, header_value);
header_value = temp_header_value;
- AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TYPE,
+ axiom_mime_body_part_add_header(root_mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TYPE,
header_value);
/* Adding Content Transfer Encoding header */
- AXIOM_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env,
+ axiom_mime_body_part_add_header(root_mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_TRANSFER_ENCODING, axutil_strdup(env,
AXIOM_MIME_CONTENT_TRANSFER_ENCODING_BINARY));
@@ -446,7 +446,7 @@ axiom_mime_part_create_part_list(
temp_content_id_string = axutil_stracat(env, content_id_string, ">");
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,
AXIOM_MIME_HEADER_CONTENT_ID,
+ axiom_mime_body_part_add_header(root_mime_body_part, env,
AXIOM_MIME_HEADER_CONTENT_ID,
content_id_string);
/* Now first insert the headers needed for SOAP */
@@ -463,7 +463,7 @@ axiom_mime_part_create_part_list(
/* Now add the SOAP body */
- AXIOM_MIME_BODY_PART_FREE(root_mime_body_part, env);
+ axiom_mime_body_part_free(root_mime_body_part, env);
root_mime_body_part = NULL;
soap_part = axiom_mime_part_create(env);
@@ -516,7 +516,7 @@ axiom_mime_part_create_part_list(
return NULL;
}
- AXIOM_MIME_BODY_PART_FREE(mime_body_part, env);
+ axiom_mime_body_part_free(mime_body_part, env);
mime_body_part = NULL;
}
}
