ben 98/09/05 09:54:16
Modified:apache-nspr/include alloc.h ap.h
apache-nspr/main fnmatch.c
apache-nspr/os/unix os.c
nsprpub/pr/include prthread.h
Log:
Fix various warnings.
Revision ChangesPath
1.3 +3 -0 apache-2.0/apache-nspr/include/alloc.h
Index: alloc.h
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/alloc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alloc.h 1998/06/30 08:57:05 1.2
+++ alloc.h 1998/09/05 16:54:08 1.3
@@ -291,6 +291,9 @@
kill_only_once /* send SIGTERM and then wait */
};
+API_EXPORT(void) ap_note_subprocess(pool *a, int pid,
+ enum kill_conditions how);
+
/* magic numbers --- min free bytes to consider a free pool block useable,
* and the min amount to allocate if we have to go to malloc() */
1.3 +0 -2 apache-2.0/apache-nspr/include/ap.h
Index: ap.h
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/include/ap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap.h 1998/06/30 08:57:05 1.2
+++ ap.h 1998/09/05 16:54:09 1.3
@@ -69,8 +69,6 @@
API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
int ap_slack(int, int);
-API_EXPORT(int) ap_snprintf(char *, size_t, const char *, ...);
-API_EXPORT(int) ap_vsnprintf(char *, size_t, const char *, va_list ap);
int ap_execle(const char *, const char *, ...);
int ap_execve(const char *, const char *argv[], const char *envp[]);
1.2 +1 -0 apache-2.0/apache-nspr/main/fnmatch.c
Index: fnmatch.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/main/fnmatch.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fnmatch.c 1998/06/30 08:48:01 1.1
+++ fnmatch.c 1998/09/05 16:54:11 1.2
@@ -46,6 +46,7 @@
#include conf.h
#include fnmatch.h
#include string.h
+#include ctype.h
#define EOS '\0'
1.2 +2 -1 apache-2.0/apache-nspr/os/unix/os.c
Index: os.c
===
RCS file: /export/home/cvs/apache-2.0/apache-nspr/os/unix/os.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- os.c 1998/06/30 08:48:02 1.1
+++ os.c 1998/09/05 16:54:13 1.2
@@ -5,6 +5,7 @@
#include conf.h
#include os.h
+#include ap.h
/* some linkers complain unless there's at least one function in each
@@ -66,7 +67,7 @@
#else /* ndef HPUX */
#ifdef DLSYM_NEEDS_UNDERSCORE
char symbol[256];
-sprintf(symbol, _%s, symname);
+ap_snprintf(symbol, sizeof symbol, _%s, symname);
return dlsym(handle, symbol);
#else
return dlsym(handle, symname);
1.2 +2 -2 apache-2.0/nsprpub/pr/include/prthread.h
Index: prthread.h
===
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/include/prthread.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prthread.h1998/06/30 08:36:31 1.1
+++ prthread.h1998/09/05 16:54:15 1.2
@@ -194,7 +194,7 @@
**
** This can return PR_FAILURE if index is invalid.
*/
-PR_EXTERN(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv);
+PR_EXTERN(PRStatus) PR_SetThreadPrivate(PRUintn indexx, void *priv);
/*
** Recover the per-thread-private data for the current thread. index is
@@ -205,7 +205,7 @@
**
** A thread can only get access to its own thread-specific-data.
*/
-PR_EXTERN(void*) PR_GetThreadPrivate(PRUintn index);
+PR_EXTERN(void*) PR_GetThreadPrivate(PRUintn indexx);
/*
** This routine sets the interrupt request for a target thread. The interrupt
