cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c

[mturk]

mturk       2005/05/15 10:06:05

  Modified:    jk/native/common jk_ajp_common.c
  Log:
  Replace all 'unsigned' with 'unsigned int'. No functional change, just
  being ANSI C conformant.
  
  Revision  Changes    Path
  1.116     +7 -7      
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- jk_ajp_common.c   15 May 2005 16:38:04 -0000      1.115
  +++ jk_ajp_common.c   15 May 2005 17:06:05 -0000      1.116
  @@ -634,7 +634,7 @@
           d->header_values = jk_pool_alloc(p, sizeof(char *) * d->num_headers);
   
           if (d->header_names && d->header_values) {
  -            unsigned i;
  +            unsigned int i;
               for (i = 0; i < d->num_headers; i++) {
                   unsigned short name = jk_b_pget_int(msg, msg->pos);
   
  @@ -1043,10 +1043,10 @@
    */
   
   static int ajp_read_fully_from_server(jk_ws_service_t *s, jk_logger_t *l,
  -                                      unsigned char *buf, unsigned len)
  +                                      unsigned char *buf, unsigned int len)
   {
  -    unsigned rdlen = 0;
  -    unsigned padded_len = len;
  +    unsigned int rdlen = 0;
  +    unsigned int padded_len = len;
   
       JK_TRACE_ENTER(l);
       if (s->is_chunked && s->no_more_chunks) {
  @@ -1063,7 +1063,7 @@
       }
   
       while (rdlen < padded_len) {
  -        unsigned this_time = 0;
  +        unsigned int this_time = 0;
           if (!s->read(s, buf + rdlen, len - rdlen, &this_time)) {
               /* Remote Client read failed. */
               JK_TRACE_EXIT(l);
  @@ -1370,7 +1370,7 @@
   
       case JK_AJP13_SEND_BODY_CHUNK:
           {
  -            unsigned len = (unsigned)jk_b_get_int(msg);
  +            unsigned int len = (unsigned int)jk_b_get_int(msg);
               if (!r->write(r, msg->buf + msg->pos, len)) {
                   jk_log(l, JK_LOG_INFO,
                          "Connection aborted or network problems");
  
  
  

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