apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/file_io/win32 filestat.c seek.c
Date Thu, 12 Apr 2001 13:43:53 GMT
wrowe       01/04/12 06:43:53

  Modified:    file_io/win32 filestat.c seek.c
  Log:
    More /w4 emit cleanups for uninit data errors
  
  Revision  Changes    Path
  1.49      +4 -2      apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- filestat.c	2001/02/16 04:15:39	1.48
  +++ filestat.c	2001/04/12 13:43:53	1.49
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include <aclapi.h>
   #include "apr_private.h"
  +#include <aclapi.h>
   #include "win32/fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  @@ -92,7 +92,7 @@
        * the given behavior.  They are -not- recommended for any set protection
        * function, such a function should -set- use GENERIC_READ/WRITE/EXECUTE
        */
  -    apr_fileperms_t prot;
  +    apr_fileperms_t prot = 0;
       if (acc & FILE_EXECUTE)
           prot |= APR_WEXECUTE;
       if (acc & FILE_WRITE_DATA)
  @@ -245,6 +245,8 @@
                                    ((wanted & APR_FINFO_GROUP) ? &grp : NULL),
                                    ((wanted & APR_FINFO_PROT) ? &dacl : NULL),
                                    NULL, &pdesc);
  +        else
  +            return APR_INCOMPLETE;
           if (rv == ERROR_SUCCESS)
               apr_pool_cleanup_register(finfo->cntxt, pdesc, free_localheap, 
                                    apr_pool_cleanup_null);
  
  
  
  1.16      +14 -12    apr/file_io/win32/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/seek.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- seek.c	2001/02/16 04:15:39	1.15
  +++ seek.c	2001/04/12 13:43:53	1.16
  @@ -115,18 +115,20 @@
           return rc;
       } else {
           switch(where) {
  -        case APR_SET: {
  -            howmove = FILE_BEGIN;
  -            break;
  -        }
  -        case APR_CUR: {
  -            howmove = FILE_CURRENT;
  -            break;
  -        }
  -        case APR_END: {
  -            howmove = FILE_END;
  -            break;
  -        }
  +            case APR_SET:
  +                howmove = FILE_BEGIN;
  +                break;
  +        
  +            case APR_CUR:
  +                howmove = FILE_CURRENT;
  +                break;
  +        
  +            case APR_END:
  +                howmove = FILE_END;
  +                break;
  +
  +            default:
  +                return APR_BADARG;
           }
   
           rv = SetFilePointer(thefile->filehand, *offset, NULL, howmove);
  
  
  

Mime
View raw message