cvs commit: jakarta-tomcat-connectors/ajp/ajplib/test ajp_msg.c ajp_link.c ajp.h

[mturk]

mturk       2004/07/28 10:43:17

  Modified:    ajp/ajplib/test ajp_msg.c ajp_link.c ajp.h
  Log:
  headerLen -> header_len; serverSide -> server_size.
  Apache convention for naming variables.
  
  Revision  Changes    Path
  1.7       +3 -3      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ajp_msg.c 28 Jul 2004 16:57:25 -0000      1.6
  +++ ajp_msg.c 28 Jul 2004 17:43:17 -0000      1.7
  @@ -139,7 +139,7 @@
   {
       apr_size_t len = msg->len - AJP_HEADER_LEN;
   
  -    if (msg->serverSide) {
  +    if (msg->server_side) {
           msg->buf[0] = 0x41;
           msg->buf[1] = 0x42;
       }
  @@ -516,7 +516,7 @@
           return APR_ENOPOOL;
       }
       
  -    msg->serverSide = 0;
  +    msg->server_side = 0;
   
       msg->buf = (apr_byte_t *)apr_palloc(pool, AJP_MSG_BUFFER_SZ);
   
  @@ -527,7 +527,7 @@
       }
   
       msg->len = 0;
  -    msg->headerLen = AJP_HEADER_LEN;
  +    msg->header_len = AJP_HEADER_LEN;
       *rmsg = msg;
       
       return APR_SUCCESS;
  
  
  
  1.6       +1 -1      jakarta-tomcat-connectors/ajp/ajplib/test/ajp_link.c
  
  Index: ajp_link.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_link.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ajp_link.c        28 Jul 2004 17:29:00 -0000      1.5
  +++ ajp_link.c        28 Jul 2004 17:43:17 -0000      1.6
  @@ -96,7 +96,7 @@
           return AJP_EINVAL;
       }
   
  -    hlen = msg->headerLen;
  +    hlen = msg->header_len;
       
       status = ilink_read(sock, msg->buf, hlen);
       
  
  
  
  1.11      +2 -2      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ajp.h     28 Jul 2004 17:33:23 -0000      1.10
  +++ ajp.h     28 Jul 2004 17:43:17 -0000      1.11
  @@ -92,10 +92,10 @@
   struct ajp_msg
   {
       apr_byte_t  *buf;
  -    apr_size_t  headerLen;
  +    apr_size_t  header_len;
       apr_size_t  len;
       apr_size_t  pos;
  -    int         serverSide;
  +    int         server_side;
   };
   
   #define AJP_HEADER_LEN              4
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]