mturk 2004/08/01 08:33:34
Modified: ajp/ajplib/test ajp_msg.c ajp.h
Log:
Make ajp_append_string as macro.
There is no need to call an extra function for that.
Revision Changes Path
1.12 +2 -29 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_msg.c
Index: ajp_msg.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_msg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ajp_msg.c 29 Jul 2004 10:10:21 -0000 1.11
+++ ajp_msg.c 1 Aug 2004 15:33:34 -0000 1.12
@@ -241,8 +241,8 @@
* @param convert When set told to convert String to ASCII
* @return APR_SUCCESS or error
*/
-apr_status_t ajp_msg_append_cvt_string(ajp_msg_t *msg, const char *value,
- int convert)
+apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
+ int convert)
{
size_t len;
@@ -271,33 +271,6 @@
return APR_SUCCESS;
}
-
-/**
- * Add a String in AJP message, and transform
- * the String in ASCII if we're on an EBCDIC machine
- *
- * @param msg AJP Message to get value from
- * @param value Pointer to String
- * @return APR_SUCCESS or error
- */
-apr_status_t ajp_msg_append_string(ajp_msg_t *msg, const char *value)
-{
- return ajp_msg_append_cvt_string(msg, value, 1);
-}
-
-
-/**
- * Add a String in AJP message.
- *
- * @param msg AJP Message to get value from
- * @param value Pointer to String
- * @return APR_SUCCESS or error
- */
-apr_status_t ajp_msg_append_ascii_string(ajp_msg_t *msg, const char *value)
-{
- return ajp_msg_append_cvt_string(msg, value, 0);
-}
-
/**
* Add a Byte array to AJP Message
1.25 +4 -12 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
Index: ajp.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ajp.h 1 Aug 2004 14:59:04 -0000 1.24
+++ ajp.h 1 Aug 2004 15:33:34 -0000 1.25
@@ -208,26 +208,18 @@
* @param convert When set told to convert String to ASCII
* @return APR_SUCCESS or error
*/
-apr_status_t ajp_msg_append_cvt_string(ajp_msg_t *msg, const char *value,
- int convert);
+apr_status_t ajp_msg_append_string_ex(ajp_msg_t *msg, const char *value,
+ int convert);
/**
* Add a String in AJP message, and transform
* the String in ASCII if we're on an EBCDIC machine
- *
- * @param msg AJP Message to get value from
- * @param value Pointer to String
- * @return APR_SUCCESS or error
*/
-apr_status_t ajp_msg_append_string(ajp_msg_t *msg, const char *value);
+#define ajp_msg_append_string(m, v) ajp_msg_append_string_ex(m, v, 1)
/**
* Add a String in AJP message.
- *
- * @param msg AJP Message to get value from
- * @param value Pointer to String
- * @return APR_SUCCESS or error
*/
-apr_status_t ajp_msg_append_ascii_string(ajp_msg_t *msg, const char *value);
+#define ajp_msg_append_string_ascii(m, v) ajp_msg_append_string_ex(m, v, 0)
/**
* Add a Byte array to AJP Message
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
