cvs commit: apr/file_io/unix open.c

[jerenkrantz]

jerenkrantz    01/12/28 22:55:24

  Modified:    file_io/unix open.c
  Log:
  Fix some stray tabs and wrap long lines.
  
  Revision  Changes    Path
  1.89      +21 -11    apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/open.c,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- open.c    21 Nov 2001 04:21:03 -0000      1.88
  +++ open.c    29 Dec 2001 06:55:24 -0000      1.89
  @@ -80,13 +80,17 @@
   #endif
       }
       else {
  -     /* Are there any error conditions other than EINTR or EBADF? */
  +        /* Are there any error conditions other than EINTR or EBADF? */
           rv = errno;
       }
       return rv != APR_SUCCESS ? rv : flush_rv;
   }
   
  -APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, 
apr_int32_t flag,  apr_fileperms_t perm, apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, 
  +                                        const char *fname, 
  +                                        apr_int32_t flag, 
  +                                        apr_fileperms_t perm, 
  +                                        apr_pool_t *cont)
   {
       int oflags = 0;
   #if APR_HAS_THREADS
  @@ -132,9 +136,9 @@
   
       if (flag & APR_CREATE) {
           oflags |= O_CREAT; 
  -     if (flag & APR_EXCL) {
  -         oflags |= O_EXCL;
  -     }
  +        if (flag & APR_EXCL) {
  +            oflags |= O_EXCL;
  +        }
       }
       if ((flag & APR_EXCL) && !(flag & APR_CREATE)) {
           return APR_EACCES;
  @@ -188,7 +192,8 @@
       }
   }
   
  -APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, const char 
*to_path,
  +APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, 
  +                                          const char *to_path,
                                             apr_pool_t *p)
   {
       if (rename(from_path, to_path) != 0) {
  @@ -197,13 +202,15 @@
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, apr_file_t 
*file)
  +APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, 
  +                                          apr_file_t *file)
   {
       *thefile = file->filedes;
       return APR_SUCCESS;
   }
   
  -APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t 
*thefile,
  +APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, 
  +                                          apr_os_file_t *thefile,
                                             apr_pool_t *cont)
   {
       int *dafile = thefile;
  @@ -230,21 +237,24 @@
       return APR_SUCCESS;
   }   
   
  -APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, 
apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, 
  +                                               apr_pool_t *cont)
   {
       int fd = STDERR_FILENO;
   
       return apr_os_file_put(thefile, &fd, cont);
   }
   
  -APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, 
apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, 
  +                                               apr_pool_t *cont)
   {
       int fd = STDOUT_FILENO;
   
       return apr_os_file_put(thefile, &fd, cont);
   }
   
  -APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, 
apr_pool_t *cont)
  +APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, 
  +                                              apr_pool_t *cont)
   {
       int fd = STDIN_FILENO;