httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c
Date Fri, 21 Apr 2000 20:05:24 GMT
stoddard    00/04/21 13:05:24

  Modified:    src/lib/apr/file_io/win32 filedup.c
               src/lib/apr/threadproc/win32 proc.c
  Log:
  Win32: Fix more compile warnings...
  
  Revision  Changes    Path
  1.14      +7 -3      apache-2.0/src/lib/apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- filedup.c	2000/04/07 02:33:58	1.13
  +++ filedup.c	2000/04/21 20:05:23	1.14
  @@ -58,13 +58,17 @@
   #include "apr_lib.h"
   #include <string.h>
   
  -ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file)
  +ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file, ap_pool_t *p)
   {
       HANDLE hCurrentProcess = GetCurrentProcess();
   
       if ((*new_file) == NULL) {
  -        (*new_file) = (ap_file_t *) ap_pcalloc(old_file->cntxt,
  -                                                   sizeof(ap_file_t));
  +        if (p == NULL) {
  +            p = old_file->cntxt;
  +        }
  +            
  +        (*new_file) = (ap_file_t *) ap_pcalloc(p,
  +                                               sizeof(ap_file_t));
           if ((*new_file) == NULL) {
               return APR_ENOMEM;
           }
  
  
  
  1.24      +4 -4      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- proc.c	2000/04/19 21:17:41	1.23
  +++ proc.c	2000/04/21 20:05:23	1.24
  @@ -125,10 +125,10 @@
           ap_create_pipe(&attr->child_out, &attr->parent_out, attr->cntxt);
   
       if (child_out != NULL)
  -        ap_dupfile(&attr->child_out, child_out);
  +        ap_dupfile(&attr->child_out, child_out, attr->cntxt);
   
       if (parent_out != NULL)
  -        ap_dupfile(&attr->parent_out, parent_out);
  +        ap_dupfile(&attr->parent_out, parent_out, attr->cntxt);
   
       return APR_SUCCESS;
   }
  @@ -139,10 +139,10 @@
           ap_create_pipe(&attr->child_err, &attr->parent_err, attr->cntxt);
   
       if (child_err != NULL)
  -        ap_dupfile(&attr->child_err, child_err);
  +        ap_dupfile(&attr->child_err, child_err, attr->cntxt);
   
       if (parent_err != NULL)
  -        ap_dupfile(&attr->parent_err, parent_err);
  +        ap_dupfile(&attr->parent_err, parent_err, attr->cntxt);
       return APR_SUCCESS;
   }
   #endif
  
  
  

Mime
View raw message