mturk 2004/07/29 23:27:57
Modified: ajp/ajplib/test ajp_header.c
Log:
cast msg->buf cause it is unsigned char.
Revision Changes Path
1.14 +8 -4 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c
Index: ajp_header.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_header.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ajp_header.c 29 Jul 2004 15:04:20 -0000 1.13
+++ ajp_header.c 30 Jul 2004 06:27:57 -0000 1.14
@@ -733,8 +733,8 @@
* Read the ajp message and return the type of the message.
*/
apr_status_t ajp_read_header(apr_socket_t *sock,
- request_rec *r,
- void **data)
+ request_rec *r,
+ void **data)
{
apr_byte_t result;
ajp_msg_t *msg;
@@ -759,6 +759,7 @@
*data = msg;
return APR_SUCCESS;
}
+
/* parse the msg to read the type */
int ajp_parse_type(request_rec *r, void *data)
{
@@ -770,6 +771,7 @@
"ajp_parse_type: got %02x", result);
return (int) result;
}
+
/* parse the headers */
apr_status_t ajp_parse_headers(request_rec *r, void *data)
{
@@ -791,8 +793,10 @@
}
return ajp_unmarshal_response(msg, r);
}
+
/* parse the header and return data address and length */
-apr_status_t ajp_parse_data(request_rec *r, void *data, apr_uint16_t *len, char
**ptr)
+apr_status_t ajp_parse_data(request_rec *r, void *data, apr_uint16_t *len,
+ char **ptr)
{
ajp_msg_t *msg;
apr_byte_t result;
@@ -814,6 +818,6 @@
if (rc != APR_SUCCESS) {
return APR_EGENERAL;
}
- *ptr = &(msg->buf[msg->pos]);
+ *ptr = (char *)&(msg->buf[msg->pos]);
return APR_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
