Re: cvs commit: apache-1.3/src/os/win32 util_win32.c
[EMAIL PROTECTED] wrote: > - if(nSlashes == 3) /* then we need to add one more to get > \\machine\share\ */ > + /* then we need to add one more to get \\machine\share\ */ > + if(nSlashes == 3) OK, this is a bit of a quibble, but... it seems to me that moving the comment to before the if() is damaging the meaning - it is only true if the if is true. Cheers, Ben. -- Ben Laurie|Phone: +44 (181) 735 0686| Apache Group member Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org/ and Technical Director|Email: [EMAIL PROTECTED] | A.L. Digital Ltd, |Apache-SSL author http://www.apache-ssl.org/ London, England. |"Apache: TDG" http://www.ora.com/catalog/apache/ WE'RE RECRUITING! http://www.aldigital.co.uk/
Re: cvs commit: apache-1.3/src/os/win32 util_win32.c
[EMAIL PROTECTED] wrote: > > coar98/09/04 14:20:42 > > Modified:src/os/win32 util_win32.c > Log: > A rash of stylistic cleanup. (Good thing Dean doesn't do Win32 ;-) But Ben does - and isn't that much fonder of it... Cheers, Ben. -- Ben Laurie|Phone: +44 (181) 735 0686| Apache Group member Freelance Consultant |Fax: +44 (181) 735 0689|http://www.apache.org/ and Technical Director|Email: [EMAIL PROTECTED] | A.L. Digital Ltd, |Apache-SSL author http://www.apache-ssl.org/ London, England. |"Apache: TDG" http://www.ora.com/catalog/apache/ WE'RE RECRUITING! http://www.aldigital.co.uk/
cvs commit: apache-2.0/apache-nspr/include conf.h
ben 98/09/05 09:18:57 Modified:apache-nspr/include conf.h Added: apache-nspr Configuration.ben Configuration.dean HOWTOBUILD Removed: apache-nspr Configuration Log: Add some hints for building, avoid clashes with Configuration files. Fix includes (perhaps suboptimally). Revision ChangesPath 1.1 apache-2.0/apache-nspr/Configuration.ben Index: Configuration.ben === EXTRA_CFLAGS=-Wall -Wshadow -Wmissing-prototypes -pipe -fno-common -DNSPR EXTRA_LDFLAGS=-g -L/home/ben/work/apache-2.0/dist/FreeBSD2.2.7_DBG.OBJ/lib EXTRA_LIBS=-lnspr21 EXTRA_INCLUDES=-I/home/ben/work/apache-2.0/dist/FreeBSD2.2.7_DBG.OBJ/include CC=gcc OPTIM=-O2 -g #RANLIB= Rule SHARED_CORE=default Rule STATUS=yes Rule SOCKS4=no Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no Rule WANTHSREGEX=default AddModule modules/standard/mod_env.o AddModule modules/standard/mod_log_config.o AddModule modules/standard/mod_mime_magic.o AddModule modules/standard/mod_mime.o AddModule modules/standard/mod_negotiation.o #AddModule modules/standard/mod_status.o #AddModule modules/standard/mod_info.o AddModule modules/standard/mod_include.o AddModule modules/standard/mod_autoindex.o AddModule modules/standard/mod_dir.o AddModule modules/standard/mod_cgi.o # AddModule modules/standard/mod_asis.o AddModule modules/standard/mod_imap.o AddModule modules/standard/mod_actions.o # AddModule modules/standard/mod_speling.o AddModule modules/standard/mod_userdir.o # AddModule modules/proxy/libproxy.a AddModule modules/standard/mod_alias.o AddModule modules/standard/mod_rewrite.o AddModule modules/standard/mod_access.o AddModule modules/standard/mod_auth.o AddModule modules/standard/mod_auth_anon.o # AddModule modules/standard/mod_auth_dbm.o # AddModule modules/standard/mod_auth_db.o # AddModule modules/standard/mod_digest.o AddModule modules/standard/mod_cern_meta.o # AddModule modules/standard/mod_expires.o AddModule modules/standard/mod_headers.o # AddModule modules/standard/mod_usertrack.o # AddModule modules/example/mod_example.o # AddModule modules/standard/mod_unique_id.o # AddModule modules/standard/mod_so.o # AddModule modules/experimental/mod_mmap_static.o AddModule modules/standard/mod_setenvif.o 1.1 apache-2.0/apache-nspr/Configuration.dean Index: Configuration.dean === EXTRA_CFLAGS=-Wall -Wshadow -Wmissing-prototypes -pipe -fno-common -DNSPR EXTRA_LDFLAGS=-g -Wl,-Map -Wl,httpd.map -Wl,-rpath -Wl,/home/dgaudet/nsprlink/lib -static EXTRA_LIBS=-L/home/dgaudet/nsprlink/lib -lnspr21 -ldl EXTRA_INCLUDES=-I/home/dgaudet/nsprlink/include CC=egcs OPTIM=-O2 -g #RANLIB= Rule SHARED_CORE=default Rule STATUS=yes Rule SOCKS4=no Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no Rule WANTHSREGEX=no AddModule modules/standard/mod_env.o AddModule modules/standard/mod_log_config.o AddModule modules/standard/mod_mime_magic.o AddModule modules/standard/mod_mime.o AddModule modules/standard/mod_negotiation.o #AddModule modules/standard/mod_status.o #AddModule modules/standard/mod_info.o AddModule modules/standard/mod_include.o AddModule modules/standard/mod_autoindex.o AddModule modules/standard/mod_dir.o AddModule modules/standard/mod_cgi.o # AddModule modules/standard/mod_asis.o AddModule modules/standard/mod_imap.o AddModule modules/standard/mod_actions.o # AddModule modules/standard/mod_speling.o AddModule modules/standard/mod_userdir.o # AddModule modules/proxy/libproxy.a AddModule modules/standard/mod_alias.o AddModule modules/standard/mod_rewrite.o AddModule modules/standard/mod_access.o AddModule modules/standard/mod_auth.o AddModule modules/standard/mod_auth_anon.o # AddModule modules/standard/mod_auth_dbm.o # AddModule modules/standard/mod_auth_db.o # AddModule modules/standard/mod_digest.o AddModule modules/standard/mod_cern_meta.o # AddModule modules/standard/mod_expires.o AddModule modules/standard/mod_headers.o # AddModule modules/standard/mod_usertrack.o # AddModule modules/example/mod_example.o # AddModule modules/standard/mod_unique_id.o # AddModule modules/standard/mod_so.o # AddModule modules/experimental/mod_mmap_static.o AddModule modules/standard/mod_setenvif.o 1.1 apache-2.0/apache-nspr/HOWTOBUILD Index: HOWTOBUILD === This is a temporary note for developers during the 2.0 development process. First, build nspr: cd .../apache-2.0/pubnspr make (or gmake) This produces a directory .../apache-2.0/dist/_DBG.OBJ, containing include and lib. Tweak .../apache-2.0/apache-nspr/Configuration to reflect this path (use full pathname
cvs commit: apache-1.3/src/include ap.h
ben 98/09/05 09:39:48 Modified:src/include ap.h Log: Remove redundant declarations. Revision ChangesPath 1.19 +0 -2 apache-1.3/src/include/ap.h Index: ap.h === RCS file: /export/home/cvs/apache-1.3/src/include/ap.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ap.h 1998/07/08 18:02:16 1.18 +++ ap.h 1998/09/05 16:39:47 1.19 @@ -67,8 +67,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[]);
cvs commit: apache-2.0/nsprpub/pr/include prthread.h
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 +#include #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
