manoj 99/04/08 21:10:41
Modified:pthreads/src/include alloc.h buff.h http_main.h scoreboard.h
pthreads/src/main buff.c fdqueue.c http_accept.c http_main.c
http_protocol.c scoreboard.c
pthreads/src/modules/standard mod_auth.c mod_auth_anon.c
mod_auth_db.c mod_auth_dbm.c mod_digest.c
Log:
Lots of minor changes that mostly eliminate warnings during a compile
with whininess settings turned on.
Revision ChangesPath
1.5 +2 -1 apache-apr/pthreads/src/include/alloc.h
Index: alloc.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/alloc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- alloc.h 1999/03/17 17:01:06 1.4
+++ alloc.h 1999/04/09 04:10:34 1.5
@@ -93,7 +93,8 @@
pool * ap_init_alloc(void); /* Set up everything */
void ap_child_init_alloc(void); /* Set up everything */
-API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of
permanent_pool */
+API_EXPORT(pool *) ap_make_sub_pool(pool *);
+API_EXPORT(pool *) ap_make_root_pool(void);
API_EXPORT(void) ap_destroy_pool(pool *);
/* used to guarantee to the pool debugging code that the sub pool will not be
1.4 +4 -0 apache-apr/pthreads/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- buff.h1999/03/15 14:26:48 1.3
+++ buff.h1999/04/09 04:10:35 1.4
@@ -145,6 +145,10 @@
/* Stream creation and modification */
API_EXPORT(BUFF *) ap_bcreate(pool *p, int flags);
API_EXPORT(void) ap_bpushfd(BUFF *fb, int fd_in, int fd_out);
+
+/* XXX - unused right now - mvsk */
+API_EXPORT(BUFF *) ap_bopenf(pool *a, const char *name, int flg, int mode);
+
#ifdef WIN32
API_EXPORT(void) ap_bpushh(BUFF *fb, HANDLE hFH);
#endif
1.5 +2 -0 apache-apr/pthreads/src/include/http_main.h
Index: http_main.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/http_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- http_main.h 1999/02/24 20:30:14 1.4
+++ http_main.h 1999/04/09 04:10:35 1.5
@@ -62,6 +62,8 @@
extern "C" {
#endif
+void clean_child_exit(int code);
+
/*
* Routines in http_main.c which other code --- in particular modules ---
* may want to call. Right now, that's limited to timeout handling.
1.7 +1 -8 apache-apr/pthreads/src/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/scoreboard.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- scoreboard.h 1999/02/15 20:38:57 1.6
+++ scoreboard.h 1999/04/09 04:10:35 1.7
@@ -200,21 +200,14 @@
#elif defined(USE_POSIX_SCOREBOARD)
static void cleanup_shared_mem(void *d);
#else
-static int force_write(int fd, void *buffer, int bufsz);
-static int force_read(int fd, void *buffer, int bufsz);
-static void cleanup_scoreboard_file(void *foo);
void reinit_scoreboard(pool *p);
#endif
API_EXPORT(void) reopen_scoreboard(pool *p);
-static void setup_shared_mem(pool *p);
-
ap_inline void ap_sync_scoreboard_image(void);
-static ap_inline void put_scoreboard_info(int child_num,
-thread_score *new_score_rec);
-static void update_scoreboard_global(void);
void increment_counts(int child_num, int thread_num, request_rec *r);
+void update_scoreboard_global(void);
API_EXPORT(int) find_child_by_pid(int pid);
int ap_update_child_status(int child_num, int thread_num, int status,
request_rec *r);
void ap_time_process_request(int child_num, int thread_num, int status);
1.7 +4 -4 apache-apr/pthreads/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- buff.c1999/03/17 17:01:16 1.6
+++ buff.c1999/04/09 04:10:36 1.7
@@ -125,7 +125,7 @@
select() sometimes returns 1 even though the write will block. We must
work around this.
*/
-int sendwithtimeout(int sock, const char *buf, int len, int flags, int sec)
+static int sendwithtimeout(int sock, const char *buf, int len, int flags,
int sec)
{
int iostate = 1;
fd_set fdset;
@@ -184,7 +184,7 @@
}
-in