cvs commit: apache-1.3/src/main alloc.c

[fielding]

fielding    99/03/07 06:05:34

  Modified:    src      CHANGES
               src/include alloc.h
               src/main alloc.c
  Log:
  Use proper pid_t type for saving PIDs in alloc.c.
  
  Submitted by: John Bley <[EMAIL PROTECTED]>
  Reviewed by:  Roy Fielding
  
  Revision  Changes    Path
  1.1261    +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1260
  retrieving revision 1.1261
  diff -u -r1.1260 -r1.1261
  --- CHANGES   1999/03/07 13:13:50     1.1260
  +++ CHANGES   1999/03/07 14:05:31     1.1261
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3.5
   
  +  *) Use proper pid_t type for saving PIDs in alloc.c.  [John Bley]
  +
     *) Replaced use of WIN32 define with HAVE_DRIVE_LETTERS to indicate
        when the OS allows a DOS drive letter within pathnames.  [Brian Havard]
   
  
  
  
  1.67      +1 -1      apache-1.3/src/include/alloc.h
  
  Index: alloc.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/alloc.h,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- alloc.h   1999/01/03 12:04:36     1.66
  +++ alloc.h   1999/03/07 14:05:33     1.67
  @@ -342,7 +342,7 @@
   };
   
   typedef struct child_info child_info;
  -API_EXPORT(void) ap_note_subprocess(pool *a, int pid,
  +API_EXPORT(void) ap_note_subprocess(pool *a, pid_t pid,
                                    enum kill_conditions how);
   API_EXPORT(int) ap_spawn_child(pool *, int (*)(void *, child_info *),
                                   void *, enum kill_conditions,
  
  
  
  1.106     +9 -7      apache-1.3/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- alloc.c   1999/01/03 12:04:37     1.105
  +++ alloc.c   1999/03/07 14:05:34     1.106
  @@ -1998,8 +1998,8 @@
       struct process_chain *next;
   };
   
  -API_EXPORT(void) ap_note_subprocess(pool *a, int pid, enum kill_conditions 
how)
  -{
  +API_EXPORT(void) ap_note_subprocess(pool *a, pid_t pid, enum kill_conditions 
  +how) {
       struct process_chain *new =
       (struct process_chain *) ap_palloc(a, sizeof(struct process_chain));
   
  @@ -2022,11 +2022,11 @@
   #define BINMODE
   #endif
   
  -static int spawn_child_core(pool *p, int (*func) (void *, child_info *),
  +static pid_t spawn_child_core(pool *p, int (*func) (void *, child_info *),
                            void *data,enum kill_conditions kill_how,
                            int *pipe_in, int *pipe_out, int *pipe_err)
   {
  -    int pid;
  +    pid_t pid;
       int in_fds[2];
       int out_fds[2];
       int err_fds[2];
  @@ -2220,7 +2220,8 @@
                               FILE **pipe_err)
   {
       int fd_in, fd_out, fd_err;
  -    int pid, save_errno;
  +    pid_t pid;
  +    int save_errno;
   
       ap_block_alarms();
   
  @@ -2280,7 +2281,7 @@
       HANDLE hPipeOutputReadDup = NULL;
       HANDLE hPipeErrorReadDup  = NULL;
       HANDLE hCurrentProcess;
  -    int pid = 0;
  +    pid_t pid = 0;
       child_info info;
   
   
  @@ -2452,7 +2453,8 @@
   
   #else
       int fd_in, fd_out, fd_err;
  -    int pid, save_errno;
  +    pid_t pid;
  +    int save_errno;
   
       ap_block_alarms();