cvs commit: apache-2.0/src/main http_config.c http_core.c http_log.c

[bjh]

bjh         99/11/07 22:05:52

  Modified:    src/main http_config.c http_core.c http_log.c
  Log:
  Get rid of a number of 'incompatible pointer type' warnings using
  ap_os_{get,put}_file() on platforms who's ap_os_file_t is not an int.
  
  Revision  Changes    Path
  1.17      +1 -1      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- http_config.c     1999/11/02 15:15:06     1.16
  +++ http_config.c     1999/11/08 06:05:48     1.17
  @@ -1247,7 +1247,7 @@
   
   static server_rec *init_server_config(process_rec *process, ap_context_t *p)
   {
  -    int errfile = STDERR_FILENO;
  +    ap_os_file_t errfile = STDERR_FILENO;
       server_rec *s = (server_rec *) ap_pcalloc(p, sizeof(server_rec));
   
       s->process = process;
  
  
  
  1.22      +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_core.c       1999/10/21 18:28:14     1.21
  +++ http_core.c       1999/11/08 06:05:50     1.22
  @@ -2475,7 +2475,7 @@
            (core_dir_config *)ap_get_module_config(r->per_dir_config, 
&core_module);
       int rangestatus, errstatus;
       ap_file_t *fd = NULL;
  -    int fd_os;
  +    ap_os_file_t fd_os;
       ap_status_t status;
   #ifdef USE_MMAP_FILES
       caddr_t mm;
  
  
  
  1.16      +3 -3      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- http_log.c        1999/11/05 21:01:44     1.15
  +++ http_log.c        1999/11/08 06:05:50     1.16
  @@ -274,7 +274,7 @@
   {
       server_rec *virt, *q;
       int replace_stderr;
  -    int errfile;
  +    ap_os_file_t errfile;
   
       open_error_log(s_main, p);
   
  @@ -316,7 +316,7 @@
   }
   
   API_EXPORT(void) ap_error_log2stderr(server_rec *s) {
  -    int errfile;
  +    ap_os_file_t errfile;
   
       ap_get_os_file(&errfile, s->error_log);
       if (   s->error_log != NULL
  @@ -331,7 +331,7 @@
       char errstr[MAX_STRING_LEN + 1];    /* + 1 to have room for '\n' */
       size_t len;
       ap_file_t *logf = NULL;
  -    int errfileno = STDERR_FILENO;
  +    ap_os_file_t errfileno = STDERR_FILENO;
   
       if (s == NULL) {
        /*