Received: (from majordom@localhost)
	by hyperreal.org (8.8.5/8.8.5) id EAA18926;
	Sun, 14 Sep 1997 04:09:36 -0700 (PDT)
Received: (from dgaudet@localhost)
	by hyperreal.org (8.8.5/8.8.5) id EAA18921
	for apache-cvs; Sun, 14 Sep 1997 04:09:34 -0700 (PDT)
Date: Sun, 14 Sep 1997 04:09:34 -0700 (PDT)
From: Dean Gaudet <dgaudet@hyperreal.org>
Message-Id: <199709141109.EAA18921@hyperreal.org>
To: apache-cvs@hyperreal.org
Subject: cvs commit: apachen/src/main http_main.h
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

dgaudet     97/09/14 04:09:34

  Modified:    src      INDENT
               src/main http_main.h
  Log:
  indent
  
  Revision  Changes    Path
  1.6       +3 -3      apachen/src/INDENT
  
  Index: INDENT
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/INDENT,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- INDENT	1997/09/14 11:06:49	1.5
  +++ INDENT	1997/09/14 11:09:32	1.6
  @@ -5,8 +5,8 @@
   ./main:				STATUS
      alloc.c
      alloc.h
  -   buff.c
  -   buff.h
  +   buff.c			RESERVED by Dean
  +   buff.h			RESERVED by Dean
      conf.h
      dummy.c
      explain.c
  @@ -22,7 +22,7 @@
      http_log.c
      http_log.h
      http_main.c			DONE by Dean
  -   http_main.h			RESERVED by Dean
  +   http_main.h			DONE by Dean
      http_protocol.c		DONE by Roy
      http_protocol.h		DONE by Roy
      http_request.c		RESERVED while Roy is working on it
  
  
  
  1.19      +15 -15    apachen/src/main/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- http_main.h	1997/09/12 20:13:19	1.18
  +++ http_main.h	1997/09/14 11:09:33	1.19
  @@ -85,17 +85,17 @@
    * reset_timeout() resets the timeout in progress.
    */
   
  -API_EXPORT(void) hard_timeout (char *, request_rec *);
  -void keepalive_timeout (char *, request_rec *);
  -API_EXPORT(void) soft_timeout (char *, request_rec *);
  -API_EXPORT(void) kill_timeout (request_rec *);     
  -API_EXPORT(void) reset_timeout (request_rec *);
  +API_EXPORT(void) hard_timeout(char *, request_rec *);
  +void keepalive_timeout(char *, request_rec *);
  +API_EXPORT(void) soft_timeout(char *, request_rec *);
  +API_EXPORT(void) kill_timeout(request_rec *);
  +API_EXPORT(void) reset_timeout(request_rec *);
   
  -API_EXPORT(void) child_terminate (request_rec *r);
  -API_EXPORT(void) sync_scoreboard_image (void);
  -int update_child_status (int child_num, int status, request_rec *r);
  -void time_process_request (int child_num, int status);
  -unsigned int set_callback_and_alarm(void (*fn)(int), int x);
  +API_EXPORT(void) child_terminate(request_rec *r);
  +API_EXPORT(void) sync_scoreboard_image(void);
  +int update_child_status(int child_num, int status, request_rec *r);
  +void time_process_request(int child_num, int status);
  +unsigned int set_callback_and_alarm(void (*fn) (int), int x);
   int check_alarm(void);
   
   #ifndef NO_OTHER_CHILD
  @@ -113,11 +113,11 @@
    * This is useful for log pipe children, to know when they've blocked.  To
    * disable this feature, use -1 for write_fd.
    */
  -API_EXPORT(void) register_other_child (int pid,
  -    void (*maintenance)(int reason, void *data, int status), void *data,
  -    int write_fd);
  +API_EXPORT(void) register_other_child(int pid,
  +       void (*maintenance) (int reason, void *data, int status), void *data,
  +				      int write_fd);
   #define OC_REASON_DEATH		0	/* child has died, caller must call
  -                                         * unregister still */
  +					 * unregister still */
   #define OC_REASON_UNWRITABLE	1	/* write_fd is unwritable */
   #define OC_REASON_RESTART	2	/* a restart is occuring, perform
   					 * any necessary cleanup (including
  @@ -134,6 +134,6 @@
    * is assumed to be unique per other_child.  This is because the pid and
    * write_fd are possibly killed off separately.
    */
  -API_EXPORT(void) unregister_other_child (void *data);
  +API_EXPORT(void) unregister_other_child(void *data);
   
   #endif