apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr-util/crypto apr_md4.c
Date Mon, 19 Nov 2001 11:12:37 GMT
trawick     01/11/19 03:12:37

  Modified:    crypto   apr_md4.c
  Log:
  apr md4 and apr xlate have different APIs w.r.t. the buffers they
  operate on, so fix it up at the interface between them to avoid
  unnecessary warnings
  
  Revision  Changes    Path
  1.4       +10 -6     apr-util/crypto/apr_md4.c
  
  Index: apr_md4.c
  ===================================================================
  RCS file: /home/cvs/apr-util/crypto/apr_md4.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_md4.c	2001/06/04 18:41:17	1.3
  +++ apr_md4.c	2001/11/19 11:12:37	1.4
  @@ -234,8 +234,10 @@
       if (inputLen >= partLen) {
           if (context->xlate) {
               inbytes_left = outbytes_left = partLen;
  -            apr_xlate_conv_buffer(context->xlate, input, &inbytes_left,
  -                                  &context->buffer[idx], &outbytes_left);
  +            apr_xlate_conv_buffer(context->xlate, (const char *)input, 
  +                                  &inbytes_left, 
  +                                  (char *)&context->buffer[idx], 
  +                                  &outbytes_left);
           }
           else {
               memcpy(&context->buffer[idx], input, partLen);
  @@ -246,8 +248,9 @@
               if (context->xlate) {
                   unsigned char inp_tmp[64];
                   inbytes_left = outbytes_left = 64;
  -                apr_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
  -                                      inp_tmp, &outbytes_left);
  +                apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
  +                                      &inbytes_left,
  +                                      (char *)inp_tmp, &outbytes_left);
                   MD4Transform(context->state, inp_tmp);
               }
               else {
  @@ -263,8 +266,9 @@
       /* Buffer remaining input */
       if (context->xlate) {
           inbytes_left = outbytes_left = inputLen - i;
  -        apr_xlate_conv_buffer(context->xlate, &input[i], &inbytes_left,
  -                              &context->buffer[idx], &outbytes_left);
  +        apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
  +                              &inbytes_left, (char *)&context->buffer[idx],

  +                              &outbytes_left);
       }
       else {
           memcpy(&context->buffer[idx], &input[i], inputLen - i);
  
  
  

Mime
View raw message