httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/main util.c
Date Fri, 31 Jan 2003 14:13:28 GMT
trawick     2003/01/31 06:13:28

  Modified:    modules/dav/main util.c
  Log:
  fix misuse of const in a recent commit
  warnings with recent gcc
  compile break with native compiler for AIX
  
  Revision  Changes    Path
  1.46      +9 -6      httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- util.c	29 Jan 2003 17:24:38 -0000	1.45
  +++ util.c	31 Jan 2003 14:13:28 -0000	1.46
  @@ -1073,6 +1073,7 @@
               case dav_if_etag:
               {
                   const char *given_etag, *current_etag;
  +                char *new_etag;
                   int mismatch;
   
                   /* Do a weak entity comparison function as defined in
  @@ -1081,9 +1082,10 @@
                   if (state_list->etag[0] == '"' &&
                       state_list->etag[1] == 'W' &&
                       state_list->etag[2] == '/') {
  -                    given_etag = apr_pstrdup(p, state_list->etag);
  -                    given_etag += 2;
  -                    given_etag[0] = '"';
  +                    new_etag = apr_pstrdup(p, state_list->etag);
  +                    new_etag += 2;
  +                    new_etag[0] = '"';
  +                    given_etag = new_etag;
                   }
                   else {
                       given_etag = state_list->etag;
  @@ -1091,9 +1093,10 @@
                   if (etag[0] == '"' &&
                       etag[1] == 'W' &&
                       etag[2] == '/') {
  -                    current_etag = apr_pstrdup(p, etag);
  -                    current_etag += 2;
  -                    current_etag[0] = '"';
  +                    new_etag = apr_pstrdup(p, etag);
  +                    new_etag += 2;
  +                    new_etag[0] = '"';
  +                    current_etag = new_etag;
                   }
                   else {
                       current_etag = etag;
  
  
  

Mime
View raw message