jfclere 2004/07/28 10:25:22
Modified: ajp/ajplib/test ajp_header.c
Log:
Fix the coding style errors and the extra ajp_ilink_send. Thanks!!!
Revision Changes Path
1.6 +11 -12 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ajp_header.c 28 Jul 2004 16:57:25 -0000 1.5
+++ ajp_header.c 28 Jul 2004 17:25:22 -0000 1.6
@@ -564,7 +564,7 @@
apr_uint16_t num_headers;
int i;
- rc = ajp_msg_get_uint16(msg,&status);
+ rc = ajp_msg_get_uint16(msg, &status);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
@@ -573,9 +573,9 @@
}
r->status = status;
- rc = ajp_msg_get_string(msg,&ptr);
+ rc = ajp_msg_get_string(msg, &ptr);
if (rc == APR_SUCCESS) {
- r->status_line = apr_pstrdup(r->connection->pool,ptr);
+ r->status_line = apr_pstrdup(r->connection->pool, ptr);
#if defined(AS400) || defined(_OSD_POSIX)
ap_xlate_proto_from_ascii(r->status_line, strlen(r->status_line));
#endif
@@ -586,9 +586,9 @@
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"ajp_unmarshal_response: status = %d", status);
- rc = ajp_msg_get_uint16(msg,&num_headers);
+ rc = ajp_msg_get_uint16(msg, &num_headers);
if (rc == APR_SUCCESS) {
- r->headers_out = apr_table_make(r->pool,num_headers);
+ r->headers_out = apr_table_make(r->pool, num_headers);
} else {
r->headers_out = NULL;
num_headers = 0;
@@ -620,7 +620,7 @@
return APR_EGENERAL;
}
} else {
- rc = ajp_msg_get_string(msg,&stringname);
+ rc = ajp_msg_get_string(msg, &stringname);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"Error ajp_unmarshal_response - "
@@ -632,7 +632,7 @@
#endif
}
- rc = ajp_msg_get_string(msg,&value);
+ rc = ajp_msg_get_string(msg, &value);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"Error ajp_unmarshal_response - "
@@ -641,7 +641,7 @@
}
#if defined(AS400) || defined(_OSD_POSIX)
- ap_xlate_proto_from_ascii(value,strlen(value));
+ ap_xlate_proto_from_ascii(value, strlen(value));
#endif
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_unmarshal_response: Header[%d] [%s] = [%s]\n",
@@ -661,27 +661,26 @@
ajp_msg_t *msg;
apr_status_t rc;
- rc = ajp_msg_create(r->pool,&msg);
+ rc = ajp_msg_create(r->pool, &msg);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_send_header: ajp_msg_create failed");
return rc;
}
- rc = ajp_marshal_into_msgb(msg,r);
+ rc = ajp_marshal_into_msgb(msg, r);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_send_header: ajp_marshal_into_msgb failed");
return rc;
}
- rc = ajp_ilink_send(sock,msg);
+ rc = ajp_ilink_send(sock, msg);
if (rc != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
"ajp_send_header: ajp_ilink_send failed");
return rc;
}
- rc = ajp_ilink_send(sock,msg);
return APR_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
