You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@locus.apache.org on 2000/04/28 08:49:56 UTC
cvs commit: apache-2.0/src/os/win32/installer/installdll/test test.c
dougm 00/04/27 23:49:55
Modified: src/lib/apr/file_io/beos readwrite.c
src/lib/apr/file_io/os2 dir.c open.c pipe.c readwrite.c
src/lib/apr/file_io/unix readwrite.c
src/lib/apr/file_io/win32 filedup.c fileio.h filestat.c
pipe.c readwrite.c
src/lib/apr/include apr_general.h
src/lib/apr/lib apr_pools.c apr_snprintf.c
src/lib/apr/locks/os2 locks.c
src/lib/apr/locks/win32 locks.c
src/lib/apr/misc/win32 names.c start.c
src/lib/apr/network_io/os2 sockets.c
src/lib/apr/network_io/win32 sendrecv.c
src/lib/apr/shmem/unix/mm mm.h mm_alloc.c mm_core.c
mm_global.c
src/lib/apr/threadproc/os2 proc.c
src/lib/apr/threadproc/win32 proc.c
src/modules/example mod_example.c
src/modules/mpm/prefork prefork.c
src/modules/mpm/winnt winnt.c
src/modules/proxy proxy_util.c
src/modules/standard mod_rewrite.h
src/os/unix os.c
src/os/win32 main_win32.c mod_isapi.c service.c util_win32.c
src/os/win32/installer/installdll install.c
src/os/win32/installer/installdll/test test.c
Log:
prefix TRUE,FALSE with APR_
Revision Changes Path
1.16 +5 -5 apache-2.0/src/lib/apr/file_io/beos/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/beos/readwrite.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- readwrite.c 2000/04/23 15:07:39 1.15
+++ readwrite.c 2000/04/28 06:49:41 1.16
@@ -83,7 +83,7 @@
if (thefile->bufpos >= thefile->dataRead) {
thefile->dataRead = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
if (thefile->dataRead == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
break;
}
thefile->filePtr += thefile->dataRead;
@@ -219,7 +219,7 @@
}
rv = read(thefile->filedes, ch, 1);
if (rv == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
return APR_EOF;
}
else if (rv != 1) {
@@ -266,14 +266,14 @@
ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
{
ssize_t rv;
- int i, used_unget = FALSE, beg_idx;
+ int i, used_unget = APR_FALSE, beg_idx;
if(len <= 1) /* as per fgets() */
return APR_SUCCESS;
if(thefile->ungetchar != -1){
str[0] = thefile->ungetchar;
- used_unget = TRUE;
+ used_unget = APR_TRUE;
beg_idx = 1;
if(str[0] == '\n' || str[0] == '\r'){
thefile->ungetchar = -1;
@@ -286,7 +286,7 @@
for (i = beg_idx; i < len; i++) {
rv = read(thefile->filedes, &str[i], 1);
if (rv == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
if(used_unget) thefile->filedes = -1;
str[i] = '\0';
return APR_EOF;
1.12 +3 -3 apache-2.0/src/lib/apr/file_io/os2/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dir.c 2000/04/14 15:58:21 1.11
+++ dir.c 2000/04/28 06:49:42 1.12
@@ -82,7 +82,7 @@
return APR_ENOMEM;
thedir->handle = 0;
- thedir->validentry = FALSE;
+ thedir->validentry = APR_FALSE;
*new = thedir;
ap_register_cleanup(cntxt, thedir, dir_cleanup, ap_null_cleanup);
return APR_SUCCESS;
@@ -122,11 +122,11 @@
}
if (rv == 0 && entries == 1) {
- thedir->validentry = TRUE;
+ thedir->validentry = APR_TRUE;
return APR_SUCCESS;
}
- thedir->validentry = FALSE;
+ thedir->validentry = APR_FALSE;
if (rv)
return APR_OS2_STATUS(rv);
1.24 +13 -13 apache-2.0/src/lib/apr/file_io/os2/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- open.c 2000/04/28 06:18:56 1.23
+++ open.c 2000/04/28 06:49:42 1.24
@@ -79,8 +79,8 @@
*new = dafile;
dafile->cntxt = cntxt;
- dafile->isopen = FALSE;
- dafile->eof_hit = FALSE;
+ dafile->isopen = APR_FALSE;
+ dafile->eof_hit = APR_FALSE;
dafile->buffer = NULL;
dafile->flags = flag;
@@ -137,13 +137,13 @@
if (rv != 0)
return APR_OS2_STATUS(rv);
- dafile->isopen = TRUE;
+ dafile->isopen = APR_TRUE;
dafile->fname = ap_pstrdup(cntxt, fname);
dafile->filePtr = 0;
dafile->bufpos = 0;
dafile->dataRead = 0;
dafile->direction = 0;
- dafile->pipe = FALSE;
+ dafile->pipe = APR_FALSE;
ap_register_cleanup(dafile->cntxt, dafile, apr_file_cleanup, ap_null_cleanup);
return APR_SUCCESS;
@@ -161,7 +161,7 @@
rc = DosClose(file->filedes);
if (rc == 0) {
- file->isopen = FALSE;
+ file->isopen = APR_FALSE;
status = APR_SUCCESS;
if (file->flags & APR_DELONCLOSE) {
@@ -208,11 +208,11 @@
(*file)->cntxt = cont;
}
(*file)->filedes = *dafile;
- (*file)->isopen = TRUE;
- (*file)->buffered = FALSE;
- (*file)->eof_hit = FALSE;
+ (*file)->isopen = APR_TRUE;
+ (*file)->buffered = APR_FALSE;
+ (*file)->eof_hit = APR_FALSE;
(*file)->flags = 0;
- (*file)->pipe = FALSE;
+ (*file)->pipe = APR_FALSE;
return APR_SUCCESS;
}
@@ -237,11 +237,11 @@
(*thefile)->cntxt = cont;
(*thefile)->filedes = 2;
(*thefile)->fname = NULL;
- (*thefile)->isopen = TRUE;
- (*thefile)->buffered = FALSE;
- (*thefile)->eof_hit = FALSE;
+ (*thefile)->isopen = APR_TRUE;
+ (*thefile)->buffered = APR_FALSE;
+ (*thefile)->eof_hit = APR_FALSE;
(*thefile)->flags = 0;
- (*thefile)->pipe = FALSE;
+ (*thefile)->pipe = APR_FALSE;
return APR_SUCCESS;
}
1.19 +5 -5 apache-2.0/src/lib/apr/file_io/os2/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pipe.c 2000/04/28 06:21:50 1.18
+++ pipe.c 2000/04/28 06:49:42 1.19
@@ -91,7 +91,7 @@
}
(*in) = (ap_file_t *)ap_palloc(cont, sizeof(ap_file_t));
- rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
+ rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, APR_FALSE);
if (rc) {
DosClose(filedes[0]);
@@ -111,8 +111,8 @@
(*in)->cntxt = cont;
(*in)->filedes = filedes[0];
(*in)->fname = ap_pstrdup(cont, pipename);
- (*in)->isopen = TRUE;
- (*in)->buffered = FALSE;
+ (*in)->isopen = APR_TRUE;
+ (*in)->buffered = APR_FALSE;
(*in)->flags = 0;
(*in)->pipe = 1;
(*in)->timeout = -1;
@@ -122,8 +122,8 @@
(*out)->cntxt = cont;
(*out)->filedes = filedes[1];
(*out)->fname = ap_pstrdup(cont, pipename);
- (*out)->isopen = TRUE;
- (*out)->buffered = FALSE;
+ (*out)->isopen = APR_TRUE;
+ (*out)->buffered = APR_FALSE;
(*out)->flags = 0;
(*out)->pipe = 1;
(*out)->timeout = -1;
1.23 +3 -3 apache-2.0/src/lib/apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- readwrite.c 2000/04/18 15:01:04 1.22
+++ readwrite.c 2000/04/28 06:49:42 1.23
@@ -91,7 +91,7 @@
rc = DosRead(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE, &thefile->dataRead );
if (thefile->dataRead == 0) {
if (rc == 0)
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
break;
}
thefile->filePtr += thefile->dataRead;
@@ -129,7 +129,7 @@
*nbytes = bytesread;
if (bytesread == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
}
return APR_SUCCESS;
@@ -255,7 +255,7 @@
}
if (bytesread == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
return APR_EOF;
}
1.45 +5 -5 apache-2.0/src/lib/apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- readwrite.c 2000/04/21 14:51:23 1.44
+++ readwrite.c 2000/04/28 06:49:43 1.45
@@ -121,7 +121,7 @@
if (thefile->bufpos >= thefile->dataRead) {
thefile->dataRead = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
if (thefile->dataRead == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
break;
}
thefile->filePtr += thefile->dataRead;
@@ -300,7 +300,7 @@
}
rv = read(thefile->filedes, ch, 1);
if (rv == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
return APR_EOF;
}
else if (rv != 1) {
@@ -347,14 +347,14 @@
ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
{
ssize_t rv;
- int i, used_unget = FALSE, beg_idx;
+ int i, used_unget = APR_FALSE, beg_idx;
if(len <= 1) /* as per fgets() */
return APR_SUCCESS;
if(thefile->ungetchar != -1){
str[0] = thefile->ungetchar;
- used_unget = TRUE;
+ used_unget = APR_TRUE;
beg_idx = 1;
if(str[0] == '\n' || str[0] == '\r'){
thefile->ungetchar = -1;
@@ -367,7 +367,7 @@
for (i = beg_idx; i < len; i++) {
rv = read(thefile->filedes, &str[i], 1);
if (rv == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
if(used_unget) thefile->filedes = -1;
str[i] = '\0';
return APR_EOF;
1.15 +1 -1 apache-2.0/src/lib/apr/file_io/win32/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filedup.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- filedup.c 2000/04/21 20:05:23 1.14
+++ filedup.c 2000/04/28 06:49:43 1.15
@@ -74,7 +74,7 @@
}
if (!DuplicateHandle(hCurrentProcess, old_file->filehand,
hCurrentProcess,
- &(*new_file)->filehand, 0, FALSE,
+ &(*new_file)->filehand, 0, APR_FALSE,
DUPLICATE_SAME_ACCESS)) {
return GetLastError();
}
1.20 +1 -1 apache-2.0/src/lib/apr/file_io/win32/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fileio.h 2000/04/27 14:55:10 1.19
+++ fileio.h 2000/04/28 06:49:43 1.20
@@ -92,7 +92,7 @@
* ugly way windows deals with case in the filesystem.
* append -- Windows doesn't support the append concept when opening files.
* APR needs to keep track of this, and always make sure we append
- * correctly when writing to a file with this flag set TRUE.
+ * correctly when writing to a file with this flag set APR_TRUE.
*/
struct ap_file_t {
1.18 +2 -2 apache-2.0/src/lib/apr/file_io/win32/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/filestat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- filestat.c 2000/04/22 06:16:21 1.17
+++ filestat.c 2000/04/28 06:49:45 1.18
@@ -96,9 +96,9 @@
if (ext && (!strcasecmp(ext,".exe") || !strcasecmp(ext,".com") ||
!strcasecmp(ext,".bat") || !strcasecmp(ext,".cmd"))) {
- return TRUE;
+ return APR_TRUE;
}
- return FALSE;
+ return APR_FALSE;
}
ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
1.17 +1 -1 apache-2.0/src/lib/apr/file_io/win32/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/pipe.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pipe.c 2000/04/28 06:28:51 1.16
+++ pipe.c 2000/04/28 06:49:45 1.17
@@ -93,7 +93,7 @@
SECURITY_ATTRIBUTES sa;
sa.nLength = sizeof(sa);
- sa.bInheritHandle = TRUE;
+ sa.bInheritHandle = APR_TRUE;
sa.lpSecurityDescriptor = NULL;
(*in) = (ap_file_t *)ap_pcalloc(cont, sizeof(ap_file_t));
1.30 +2 -2 apache-2.0/src/lib/apr/file_io/win32/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- readwrite.c 2000/04/27 14:55:10 1.29
+++ readwrite.c 2000/04/28 06:49:45 1.30
@@ -174,7 +174,7 @@
return GetLastError();
}
if (bread == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
return APR_EOF;
}
return APR_SUCCESS;
@@ -200,7 +200,7 @@
}
}
if (bread == 0) {
- thefile->eof_hit = TRUE;
+ thefile->eof_hit = APR_TRUE;
return APR_EOF;
}
for (i=0; i<len; i++) {
1.30 +2 -2 apache-2.0/src/lib/apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apr_general.h 2000/04/26 02:42:57 1.29
+++ apr_general.h 2000/04/28 06:49:46 1.30
@@ -72,8 +72,8 @@
extern "C" {
#endif /* __cplusplus */
-#define TRUE 1
-#define FALSE 0
+#define APR_TRUE 1
+#define APR_FALSE 0
#define MAXIMUM_WAIT_OBJECTS 64
1.48 +1 -1 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apr_pools.c 2000/04/22 15:44:55 1.47
+++ apr_pools.c 2000/04/28 06:49:46 1.48
@@ -872,7 +872,7 @@
return NULL;
}
-/* return TRUE iff a is an ancestor of b
+/* return APR_TRUE iff a is an ancestor of b
* NULL is considered an ancestor of all pools
*/
API_EXPORT(int) ap_pool_is_ancestor(ap_pool_t *a, ap_pool_t *b)
1.16 +15 -15 apache-2.0/src/lib/apr/lib/apr_snprintf.c
Index: apr_snprintf.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apr_snprintf.c 2000/04/22 06:16:26 1.15
+++ apr_snprintf.c 2000/04/28 06:49:46 1.16
@@ -82,11 +82,11 @@
NO = 0, YES = 1
} boolean_e;
-#ifndef FALSE
-#define FALSE 0
+#ifndef APR_FALSE
+#define APR_FALSE 0
#endif
-#ifndef TRUE
-#define TRUE 1
+#ifndef APR_TRUE
+#define APR_TRUE 1
#endif
#ifndef AP_LONGEST_LONG
#define AP_LONGEST_LONG long
@@ -352,8 +352,8 @@
* Return value:
* - a pointer to a string containing the number (no sign)
* - len contains the length of the string
- * - is_negative is set to TRUE or FALSE depending on the sign
- * of the number (always set to FALSE if is_unsigned is TRUE)
+ * - is_negative is set to APR_TRUE or APR_FALSE depending on the sign
+ * of the number (always set to APR_FALSE if is_unsigned is APR_TRUE)
*
* The caller provides a buffer for the string: that is the buf_end argument
* which is a pointer to the END of the buffer + 1 (i.e. if the buffer
@@ -372,7 +372,7 @@
if (is_unsigned) {
magnitude = (u_wide_int) num;
- *is_negative = FALSE;
+ *is_negative = APR_FALSE;
}
else {
*is_negative = (num < 0);
@@ -428,7 +428,7 @@
if (is_unsigned) {
magnitude = (u_widest_int) num;
- *is_negative = FALSE;
+ *is_negative = APR_FALSE;
}
else {
*is_negative = (num < 0);
@@ -475,13 +475,13 @@
bool_int is_negative;
int sub_len;
- p = conv_10((addr & 0x000000FF) , TRUE, &is_negative, p, &sub_len);
+ p = conv_10((addr & 0x000000FF) , APR_TRUE, &is_negative, p, &sub_len);
*--p = '.';
- p = conv_10((addr & 0x0000FF00) >> 8, TRUE, &is_negative, p, &sub_len);
+ p = conv_10((addr & 0x0000FF00) >> 8, APR_TRUE, &is_negative, p, &sub_len);
*--p = '.';
- p = conv_10((addr & 0x00FF0000) >> 16, TRUE, &is_negative, p, &sub_len);
+ p = conv_10((addr & 0x00FF0000) >> 16, APR_TRUE, &is_negative, p, &sub_len);
*--p = '.';
- p = conv_10((addr & 0xFF000000) >> 24, TRUE, &is_negative, p, &sub_len);
+ p = conv_10((addr & 0xFF000000) >> 24, APR_TRUE, &is_negative, p, &sub_len);
*len = buf_end - p;
return (p);
@@ -495,7 +495,7 @@
bool_int is_negative;
int sub_len;
- p = conv_10(ntohs(si->sin_port), TRUE, &is_negative, p, &sub_len);
+ p = conv_10(ntohs(si->sin_port), APR_TRUE, &is_negative, p, &sub_len);
*--p = ':';
p = conv_in_addr(&si->sin_addr, p, &sub_len);
@@ -530,7 +530,7 @@
*/
if (ap_isalpha(*p)) {
*len = strlen(strcpy(buf, p));
- *is_negative = FALSE;
+ *is_negative = APR_FALSE;
return (buf);
}
@@ -572,7 +572,7 @@
*s++ = format; /* either e or E */
decimal_point--;
if (decimal_point != 0) {
- p = conv_10((wide_int) decimal_point, FALSE, &exponent_is_negative,
+ p = conv_10((wide_int) decimal_point, APR_FALSE, &exponent_is_negative,
&temp[EXPONENT_LENGTH], &t_len);
*s++ = exponent_is_negative ? '-' : '+';
1.16 +1 -1 apache-2.0/src/lib/apr/locks/os2/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- locks.c 2000/04/14 23:52:22 1.15
+++ locks.c 2000/04/28 06:49:46 1.16
@@ -99,7 +99,7 @@
else
semname = ap_pstrcat(cont, "/SEM32/", fname, NULL);
- rc = DosCreateMutexSem(semname, &(new->hMutex), scope == APR_CROSS_PROCESS ? DC_SEM_SHARED : 0, FALSE);
+ rc = DosCreateMutexSem(semname, &(new->hMutex), scope == APR_CROSS_PROCESS ? DC_SEM_SHARED : 0, APR_FALSE);
*lock = new;
if (!rc)
1.23 +4 -4 apache-2.0/src/lib/apr/locks/win32/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- locks.c 2000/04/19 21:17:33 1.22
+++ locks.c 2000/04/28 06:49:47 1.23
@@ -77,16 +77,16 @@
sec.lpSecurityDescriptor = NULL;
if (scope == APR_CROSS_PROCESS || scope == APR_LOCKALL) {
- sec.bInheritHandle = TRUE;
+ sec.bInheritHandle = APR_TRUE;
}
else {
- sec.bInheritHandle = FALSE;
+ sec.bInheritHandle = APR_FALSE;
}
if (scope == APR_INTRAPROCESS) {
InitializeCriticalSection(&newlock->section);
} else {
- newlock->mutex = CreateMutex(&sec, FALSE, fname);
+ newlock->mutex = CreateMutex(&sec, APR_FALSE, fname);
}
*lock = newlock;
return APR_SUCCESS;
@@ -104,7 +104,7 @@
return APR_ENOMEM;
}
(*lock)->fname = ap_pstrdup(cont, fname);
- (*lock)->mutex = OpenMutex(MUTEX_ALL_ACCESS, TRUE, fname);
+ (*lock)->mutex = OpenMutex(MUTEX_ALL_ACCESS, APR_TRUE, fname);
if ((*lock)->mutex == NULL) {
return APR_EEXIST;
1.10 +10 -10 apache-2.0/src/lib/apr/misc/win32/names.c
Index: names.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- names.c 2000/04/22 06:16:37 1.9
+++ names.c 2000/04/28 06:49:47 1.10
@@ -60,7 +60,7 @@
#include <string.h>
#include <sys/stat.h>
-/* Returns TRUE if the input string is a string
+/* Returns APR_TRUE if the input string is a string
* of one or more '.' characters.
*/
static BOOL OnlyDots(char *pString)
@@ -68,13 +68,13 @@
char *c;
if (*pString == '\0')
- return FALSE;
+ return APR_FALSE;
for (c = pString;*c;c++)
if (*c != '.')
- return FALSE;
+ return APR_FALSE;
- return TRUE;
+ return APR_TRUE;
}
/* Accepts as input a pathname, and tries to match it to an
@@ -88,8 +88,8 @@
char buf[HUGE_STRING_LEN];
char *pInputName;
char *p, *q;
- BOOL bDone = FALSE;
- BOOL bFileExists = TRUE;
+ BOOL bDone = APR_FALSE;
+ BOOL bFileExists = APR_TRUE;
HANDLE hFind;
WIN32_FIND_DATA wfd;
@@ -114,7 +114,7 @@
/* If all we have is a drive letter, then we are done */
if (strlen(pInputName) == 2)
- bDone = TRUE;
+ bDone = APR_TRUE;
}
q = p;
@@ -151,7 +151,7 @@
*p = '\0';
if (strchr(q, '*') || strchr(q, '?'))
- bFileExists = FALSE;
+ bFileExists = APR_FALSE;
/* If the path exists so far, call FindFirstFile
* again. However, if this portion of the path contains
@@ -164,7 +164,7 @@
hFind = FindFirstFile(pInputName, &wfd);
if (hFind == INVALID_HANDLE_VALUE) {
- bFileExists = FALSE;
+ bFileExists = APR_FALSE;
}
else {
FindClose(hFind);
@@ -185,7 +185,7 @@
p = strchr(p, '\\');
}
else {
- bDone = TRUE;
+ bDone = APR_TRUE;
}
}
1.28 +2 -2 apache-2.0/src/lib/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- start.c 2000/04/27 14:59:49 1.27
+++ start.c 2000/04/28 06:49:47 1.28
@@ -100,11 +100,11 @@
{
static OSVERSIONINFO oslev;
static unsigned int servpack = 0;
- static BOOL first = TRUE;
+ static BOOL first = APR_TRUE;
char *pservpack;
if (first) {
- first = FALSE;
+ first = APR_FALSE;
oslev.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
GetVersionEx(&oslev);
if (oslev.dwPlatformId == VER_PLATFORM_WIN32_NT) {
1.20 +2 -2 apache-2.0/src/lib/apr/network_io/os2/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sockets.c 2000/04/24 14:07:31 1.19
+++ sockets.c 2000/04/28 06:49:48 1.20
@@ -106,7 +106,7 @@
return APR_OS2_STATUS(sock_errno());
}
(*new)->timeout = -1;
- (*new)->nonblock = FALSE;
+ (*new)->nonblock = APR_FALSE;
ap_register_cleanup((*new)->cntxt, (void *)(*new),
socket_cleanup, ap_null_cleanup);
return APR_SUCCESS;
@@ -158,7 +158,7 @@
(*new)->local_addr = sock->local_addr;
(*new)->addr_len = sizeof(struct sockaddr_in);
(*new)->timeout = -1;
- (*new)->nonblock = FALSE;
+ (*new)->nonblock = APR_FALSE;
(*new)->socketdes = accept(sock->socketdes, (struct sockaddr *)(*new)->remote_addr,
&(*new)->addr_len);
1.15 +1 -1 apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sendrecv.c 2000/04/16 16:59:39 1.14
+++ sendrecv.c 2000/04/28 06:49:48 1.15
@@ -225,7 +225,7 @@
overlapped.Offset = *offset;
}
#ifdef WAIT_FOR_EVENT
- overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+ overlapped.hEvent = CreateEvent(NULL, FALSE, APR_FALSE, NULL);
#endif
rv = TransmitFile(sock->sock, /* socket */
1.4 +4 -4 apache-2.0/src/lib/apr/shmem/unix/mm/mm.h
Index: mm.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mm.h 2000/02/05 12:07:37 1.3
+++ mm.h 2000/04/28 06:49:48 1.4
@@ -92,11 +92,11 @@
extern char *strerror(int);
#endif
-#if !defined(FALSE)
-#define FALSE 0
+#if !defined(APR_FALSE)
+#define APR_FALSE 0
#endif
-#if !defined(TRUE)
-#define TRUE !FALSE
+#if !defined(APR_TRUE)
+#define APR_TRUE !APR_FALSE
#endif
#if !defined(NULL)
#define NULL (void *)0
1.4 +2 -2 apache-2.0/src/lib/apr/shmem/unix/mm/mm_alloc.c
Index: mm_alloc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_alloc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mm_alloc.c 1999/09/27 07:42:08 1.3
+++ mm_alloc.c 2000/04/28 06:49:48 1.4
@@ -120,7 +120,7 @@
int mm_lock(MM *mm, mm_lock_mode mode)
{
if (mm == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_core_lock((void *)mm, mode);
}
@@ -130,7 +130,7 @@
int mm_unlock(MM *mm)
{
if (mm == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_core_unlock((void *)mm);
}
1.4 +8 -8 apache-2.0/src/lib/apr/shmem/unix/mm/mm_core.c
Index: mm_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mm_core.c 2000/02/05 12:07:38 1.3
+++ mm_core.c 2000/04/28 06:49:49 1.4
@@ -73,7 +73,7 @@
static void mm_core_init(void)
{
- static int initialized = FALSE;
+ static int initialized = APR_FALSE;
if (!initialized) {
#if defined(MM_SEMT_FCNTL)
mm_core_dolock_rd.l_whence = SEEK_SET; /* from current point */
@@ -103,7 +103,7 @@
mm_core_dounlock[0].sem_op = -1;
mm_core_dounlock[0].sem_flg = SEM_UNDO;
#endif
- initialized = TRUE;
+ initialized = APR_TRUE;
}
return;
}
@@ -519,7 +519,7 @@
int fdsem;
if (core == NULL)
- return FALSE;
+ return APR_FALSE;
mc = (mem_core *)((char *)core-SIZEOF_mem_core);
#if !defined(MM_SEMT_FLOCK)
fdsem = mc->mc_fdsem;
@@ -566,10 +566,10 @@
if (rc < 0) {
ERR(MM_ERR_CORE|MM_ERR_SYSTEM, "Failed to lock");
- rc = FALSE;
+ rc = APR_FALSE;
}
else
- rc = TRUE;
+ rc = APR_TRUE;
return rc;
}
@@ -580,7 +580,7 @@
int fdsem;
if (core == NULL)
- return FALSE;
+ return APR_FALSE;
mc = (mem_core *)((char *)core-SIZEOF_mem_core);
#if !defined(MM_SEMT_FLOCK)
fdsem = mc->mc_fdsem;
@@ -616,10 +616,10 @@
if (rc < 0) {
ERR(MM_ERR_CORE|MM_ERR_SYSTEM, "Failed to unlock");
- rc = FALSE;
+ rc = APR_FALSE;
}
else
- rc = TRUE;
+ rc = APR_TRUE;
return rc;
}
1.2 +5 -5 apache-2.0/src/lib/apr/shmem/unix/mm/mm_global.c
Index: mm_global.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/unix/mm/mm_global.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mm_global.c 1999/08/17 15:59:45 1.1
+++ mm_global.c 2000/04/28 06:49:49 1.2
@@ -52,10 +52,10 @@
int MM_create(size_t size, const char *file)
{
if (mm_global != NULL)
- return FALSE;
+ return APR_FALSE;
if ((mm_global = mm_create(size, file)) == NULL)
- return FALSE;
- return TRUE;
+ return APR_FALSE;
+ return APR_TRUE;
}
int MM_permission(mode_t mode, uid_t owner, gid_t group)
@@ -77,14 +77,14 @@
int MM_lock(mm_lock_mode mode)
{
if (mm_global == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_lock(mm_global, mode);
}
int MM_unlock(void)
{
if (mm_global == NULL)
- return FALSE;
+ return APR_FALSE;
return mm_unlock(mm_global);
}
1.22 +6 -6 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- proc.c 2000/04/22 06:16:46 1.21
+++ proc.c 2000/04/28 06:49:49 1.22
@@ -88,7 +88,7 @@
(*new)->child_err = NULL;
(*new)->currdir = NULL;
(*new)->cmdtype = APR_PROGRAM;
- (*new)->detached = FALSE;
+ (*new)->detached = APR_FALSE;
return APR_SUCCESS;
}
@@ -177,13 +177,13 @@
} else if (pid == 0) {
(*proc)->pid = pid;
(*proc)->attr = NULL;
- (*proc)->running = TRUE;
+ (*proc)->running = APR_TRUE;
return APR_INCHILD;
}
(*proc)->pid = pid;
(*proc)->attr = NULL;
- (*proc)->running = TRUE;
+ (*proc)->running = APR_TRUE;
return APR_INPARENT;
}
@@ -226,7 +226,7 @@
char **newargs;
char savedir[300];
HFILE save_in, save_out, save_err, dup;
- int criticalsection = FALSE;
+ int criticalsection = APR_FALSE;
char *extension, *newprogname, *extra_arg = NULL, *cmdline, *cmdline_pos;
char interpreter[1024];
char error_object[260];
@@ -242,11 +242,11 @@
}
(*new)->cntxt = cont;
- (*new)->running = FALSE;
+ (*new)->running = APR_FALSE;
/* Prevent other threads from running while these process-wide resources are modified */
if (attr->child_in || attr->child_out || attr->child_err || attr->currdir) {
- criticalsection = TRUE;
+ criticalsection = APR_TRUE;
DosEnterCritSec();
}
1.25 +5 -5 apache-2.0/src/lib/apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- proc.c 2000/04/21 20:05:23 1.24
+++ proc.c 2000/04/28 06:49:50 1.25
@@ -82,7 +82,7 @@
(*new)->child_err = NULL;
(*new)->currdir = NULL;
(*new)->cmdtype = APR_PROGRAM;
- (*new)->detached = TRUE;
+ (*new)->detached = APR_TRUE;
memset(&(*new)->si, 0, sizeof((*new)->si));
@@ -277,14 +277,14 @@
hCurrentProcess = GetCurrentProcess();
if ((attr->child_in && !DuplicateHandle(hCurrentProcess, attr->parent_in->filehand,
hCurrentProcess,
- &hParentindup, 0, FALSE,
+ &hParentindup, 0, APR_FALSE,
DUPLICATE_SAME_ACCESS))
|| (attr->child_out && !DuplicateHandle(hCurrentProcess, attr->parent_out->filehand,
hCurrentProcess, &hParentoutdup,
- 0, FALSE, DUPLICATE_SAME_ACCESS))
+ 0, APR_FALSE, DUPLICATE_SAME_ACCESS))
|| (attr->child_err && !DuplicateHandle(hCurrentProcess, attr->parent_err->filehand,
hCurrentProcess, &hParenterrdup,
- 0, FALSE, DUPLICATE_SAME_ACCESS))) {
+ 0, APR_FALSE, DUPLICATE_SAME_ACCESS))) {
if (attr->child_in) {
ap_close(attr->child_in);
ap_close(attr->parent_in);
@@ -346,7 +346,7 @@
}
- if (CreateProcess(NULL, cmdline, NULL, NULL, TRUE, 0, pEnvBlock, attr->currdir,
+ if (CreateProcess(NULL, cmdline, NULL, NULL, APR_TRUE, 0, pEnvBlock, attr->currdir,
&attr->si, &(*new)->pi)) {
if (attr->child_in) {
ap_close(attr->child_in);
1.10 +1 -1 apache-2.0/src/modules/example/mod_example.c
Index: mod_example.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/example/mod_example.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_example.c 2000/04/26 07:14:35 1.9
+++ mod_example.c 2000/04/28 06:49:51 1.10
@@ -775,7 +775,7 @@
merged_config->loc = ap_pstrdup(p, nconf->loc);
/*
* Others, like the setting of the `congenital' flag, get ORed in. The
- * setting of that particular flag, for instance, is TRUE if it was ever
+ * setting of that particular flag, for instance, is APR_TRUE if it was ever
* true anywhere in the upstream configuration.
*/
merged_config->congenital = (pconf->congenital | pconf->local);
1.79 +1 -1 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- prefork.c 2000/04/14 20:54:25 1.78
+++ prefork.c 2000/04/28 06:49:51 1.79
@@ -691,7 +691,7 @@
*/
static void accept_mutex_init(ap_pool_t *p)
{
- int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, FALSE);
+ int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, APR_FALSE);
if (rc != 0) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, server_conf,
1.60 +21 -21 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- winnt.c 2000/04/27 14:59:50 1.59
+++ winnt.c 2000/04/28 06:49:51 1.60
@@ -172,7 +172,7 @@
LocalFree( sa );
return NULL;
}
- if (!SetSecurityDescriptorDacl(pSD, TRUE, (PACL) NULL, FALSE)
+ if (!SetSecurityDescriptorDacl(pSD, APR_TRUE, (PACL) NULL, APR_FALSE)
|| GetLastError()) {
LocalFree( pSD );
LocalFree( sa );
@@ -180,7 +180,7 @@
}
sa->nLength = sizeof(sa);
sa->lpSecurityDescriptor = pSD;
- sa->bInheritHandle = TRUE;
+ sa->bInheritHandle = APR_TRUE;
return sa;
}
@@ -204,7 +204,7 @@
time_t tStopTime;
DWORD dwRet = WAIT_TIMEOUT;
DWORD dwIndex=0;
- BOOL bFirst = TRUE;
+ BOOL bFirst = APR_TRUE;
tStopTime = time(NULL) + dwSeconds;
@@ -212,7 +212,7 @@
if (!bFirst)
Sleep(1000);
else
- bFirst = FALSE;
+ bFirst = APR_FALSE;
for (dwIndex = 0; dwIndex * MAXIMUM_WAIT_OBJECTS < nCount; dwIndex++) {
dwRet = WaitForMultipleObjects(
@@ -279,7 +279,7 @@
case 1: signal_name = signal_restart_name; break;
default: return;
}
- e = OpenEvent(EVENT_ALL_ACCESS, FALSE, signal_name);
+ e = OpenEvent(EVENT_ALL_ACCESS, APR_FALSE, signal_name);
if (!e) {
/* Um, problem, can't signal the parent, which means we can't
* signal ourselves to die. Ignore for now...
@@ -819,7 +819,7 @@
/* initialize the completion context */
context->lr = lr;
- context->Overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ context->Overlapped.hEvent = CreateEvent(NULL, APR_TRUE, APR_FALSE, NULL);
if (context->Overlapped.hEvent == NULL) {
ap_log_error(APLOG_MARK,APLOG_ERR, GetLastError(), server_conf,
"create_acceptex_context: CreateEvent() failed. Process will exit.");
@@ -1130,7 +1130,7 @@
if (one_process) {
/* Single process mode */
ap_create_lock(&start_mutex,APR_MUTEX, APR_CROSS_PROCESS,signal_name_prefix,pconf);
- exit_event = CreateEvent(NULL, TRUE, FALSE, exit_event_name);
+ exit_event = CreateEvent(NULL, APR_TRUE, APR_FALSE, exit_event_name);
setup_listeners(server_conf);
bind_listeners_to_completion_port();
@@ -1138,7 +1138,7 @@
else {
/* Child process mode */
ap_child_init_lock(&start_mutex, signal_name_prefix, pconf);
- exit_event = OpenEvent(EVENT_ALL_ACCESS, FALSE, exit_event_name);
+ exit_event = OpenEvent(EVENT_ALL_ACCESS, APR_FALSE, exit_event_name);
ap_log_error(APLOG_MARK, APLOG_INFO, APR_SUCCESS, server_conf,
"Child %d: exit_event_name = %s", my_pid, exit_event_name);
@@ -1146,7 +1146,7 @@
}
/* Initialize the child_events */
- maintenance_event = CreateEvent(NULL, TRUE, FALSE, NULL);
+ maintenance_event = CreateEvent(NULL, APR_TRUE, APR_FALSE, NULL);
child_events[0] = exit_event;
child_events[1] = maintenance_event;
@@ -1206,7 +1206,7 @@
* number of completion contexts, etc.)
*/
while (!workers_may_exit) {
- rv = WaitForMultipleObjects(2, (HANDLE *) child_events, FALSE, INFINITE);
+ rv = WaitForMultipleObjects(2, (HANDLE *) child_events, APR_FALSE, INFINITE);
cld = rv - WAIT_OBJECT_0;
if (rv == WAIT_FAILED) {
/* Something serious is wrong */
@@ -1220,7 +1220,7 @@
Sleep(1000);
/* Drain any remaining contexts. May loose a few connections here. */
- drain_acceptex_complport(AcceptExCompPort, FALSE);
+ drain_acceptex_complport(AcceptExCompPort, APR_FALSE);
}
else if (rv == WAIT_TIMEOUT) {
/* Hey, this cannot happen */
@@ -1365,7 +1365,7 @@
SECURITY_ATTRIBUTES sa = {0};
sa.nLength = sizeof(sa);
- sa.bInheritHandle = TRUE;
+ sa.bInheritHandle = APR_TRUE;
sa.lpSecurityDescriptor = NULL;
/* Build the command line. Should look something like this:
@@ -1409,7 +1409,7 @@
si.hStdInput = hPipeRead;
if (!CreateProcess(NULL, pCommand, NULL, NULL,
- TRUE, /* Inherit handles */
+ APR_TRUE, /* Inherit handles */
CREATE_SUSPENDED, /* Creation flags */
NULL, /* Environment block */
NULL,
@@ -1436,9 +1436,9 @@
/* Create the exit_event, apCchild_pid */
sa.nLength = sizeof(sa);
- sa.bInheritHandle = TRUE;
+ sa.bInheritHandle = APR_TRUE;
sa.lpSecurityDescriptor = NULL;
- kill_event = CreateEvent(&sa, TRUE, FALSE, ap_psprintf(pconf,"apC%d", pi.dwProcessId));
+ kill_event = CreateEvent(&sa, APR_TRUE, APR_FALSE, ap_psprintf(pconf,"apC%d", pi.dwProcessId));
if (!kill_event) {
ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
"Parent: Could not create exit event for child process");
@@ -1486,7 +1486,7 @@
/* Now, send the AcceptEx completion port to the child */
if (!DuplicateHandle(GetCurrentProcess(), AcceptExCompPort,
pi.hProcess, &hDupedCompPort, 0,
- TRUE, DUPLICATE_SAME_ACCESS)) {
+ APR_TRUE, DUPLICATE_SAME_ACCESS)) {
ap_log_error(APLOG_MARK, APLOG_CRIT, GetLastError(), server_conf,
"Parent: Unable to duplicate AcceptEx completion port. Shutting down.");
return -1;
@@ -1540,7 +1540,7 @@
process_handles[current_live_processes+1] = restart_event;
rv = WaitForMultipleObjects(current_live_processes+2, (HANDLE *)process_handles,
- FALSE, INFINITE);
+ APR_FALSE, INFINITE);
cld = rv - WAIT_OBJECT_0;
if (rv == WAIT_FAILED) {
/* Something serious is wrong */
@@ -1608,7 +1608,7 @@
/* Drain the AcceptEx completion port of any outstanding I/O pending for the dead
* process. */
- drain_acceptex_complport(AcceptExCompPort, FALSE);
+ drain_acceptex_complport(AcceptExCompPort, APR_FALSE);
}
die_now:
@@ -1623,7 +1623,7 @@
}
while (current_live_processes && ((tmstart+60) > time(NULL))) {
- rv = WaitForMultipleObjects(current_live_processes, (HANDLE *)process_handles, FALSE, 2000);
+ rv = WaitForMultipleObjects(current_live_processes, (HANDLE *)process_handles, APR_FALSE, 2000);
if (rv == WAIT_TIMEOUT)
continue;
ap_assert(rv != WAIT_FAILED);
@@ -1709,7 +1709,7 @@
/* Create shutdown event, apPID_shutdown, where PID is the parent
* Apache process ID. Shutdown is signaled by 'apache -k shutdown'.
*/
- shutdown_event = CreateEvent(sa, FALSE, FALSE, signal_shutdown_name);
+ shutdown_event = CreateEvent(sa, FALSE, APR_FALSE, signal_shutdown_name);
if (!shutdown_event) {
ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
"Parent: Cannot create shutdown event %s", signal_shutdown_name);
@@ -1720,7 +1720,7 @@
/* Create restart event, apPID_restart, where PID is the parent
* Apache process ID. Restart is signaled by 'apache -k restart'.
*/
- restart_event = CreateEvent(sa, FALSE, FALSE, signal_restart_name);
+ restart_event = CreateEvent(sa, FALSE, APR_FALSE, signal_restart_name);
if (!restart_event) {
CloseHandle(shutdown_event);
ap_log_error(APLOG_MARK, APLOG_EMERG, GetLastError(), server_conf,
1.12 +8 -8 apache-2.0/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_util.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- proxy_util.c 2000/04/23 02:32:58 1.11
+++ proxy_util.c 2000/04/28 06:49:52 1.12
@@ -906,7 +906,7 @@
return host; /* ought to return the port, too */
}
-/* Return TRUE if addr represents an IP address (or an IP network address) */
+/* Return APR_TRUE if addr represents an IP address (or an IP network address) */
int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p)
{
const char *addr = This->name;
@@ -1010,7 +1010,7 @@
return (*addr == '\0'); /* okay iff we've parsed the whole string */
}
-/* Return TRUE if addr represents an IP address (or an IP network address) */
+/* Return APR_TRUE if addr represents an IP address (or an IP network address) */
static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r)
{
int i;
@@ -1102,7 +1102,7 @@
return 0;
}
-/* Return TRUE if addr represents a domain name */
+/* Return APR_TRUE if addr represents a domain name */
int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p)
{
char *addr = This->name;
@@ -1135,7 +1135,7 @@
return 1;
}
-/* Return TRUE if host "host" is in domain "domain" */
+/* Return APR_TRUE if host "host" is in domain "domain" */
static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r)
{
const char *host = proxy_get_host_of_request(r);
@@ -1156,7 +1156,7 @@
&& strncasecmp(&host[h_len - d_len], This->name, d_len) == 0;
}
-/* Return TRUE if addr represents a host name */
+/* Return APR_TRUE if addr represents a host name */
int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p)
{
struct hostent host;
@@ -1191,7 +1191,7 @@
return 1;
}
-/* Return TRUE if host "host" is equal to host2 "host2" */
+/* Return APR_TRUE if host "host" is equal to host2 "host2" */
static int proxy_match_hostname(struct dirconn_entry *This, request_rec *r)
{
char *host = This->name;
@@ -1223,14 +1223,14 @@
&& strncasecmp(host, host2, h1_len) == 0;
}
-/* Return TRUE if addr is to be matched as a word */
+/* Return APR_TRUE if addr is to be matched as a word */
int ap_proxy_is_word(struct dirconn_entry *This, ap_pool_t *p)
{
This->matcher = proxy_match_word;
return 1;
}
-/* Return TRUE if string "str2" occurs literally in "str1" */
+/* Return APR_TRUE if string "str2" occurs literally in "str1" */
static int proxy_match_word(struct dirconn_entry *This, request_rec *r)
{
const char *host = proxy_get_host_of_request(r);
1.9 +5 -5 apache-2.0/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_rewrite.h 2000/04/14 15:59:10 1.8
+++ mod_rewrite.h 2000/04/28 06:49:52 1.9
@@ -197,14 +197,14 @@
#define CACHE_TLB_ROWS 1024
#define CACHE_TLB_COLS 4
-#ifndef FALSE
-#define FALSE 0
-#define TRUE !FALSE
+#ifndef APR_FALSE
+#define APR_FALSE 0
+#define APR_TRUE !APR_FALSE
#endif
#ifndef NO
-#define NO FALSE
-#define YES TRUE
+#define NO APR_FALSE
+#define YES APR_TRUE
#endif
#ifndef RAND_MAX
1.8 +2 -2 apache-2.0/src/os/unix/os.c
Index: os.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/os.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- os.c 2000/03/31 09:17:16 1.7
+++ os.c 2000/04/28 06:49:53 1.8
@@ -168,7 +168,7 @@
if (NSCreateObjectFileImageFromFile(path, &image) !=
NSObjectFileImageSuccess)
return NULL;
- return NSLinkModule(image, path, TRUE);
+ return NSLinkModule(image, path, APR_TRUE);
#elif defined(OSF1) || defined(SEQUENT) ||\
(defined(__FreeBSD_version) && (__FreeBSD_version >= 220000))
@@ -185,7 +185,7 @@
shl_unload((shl_t)handle);
#elif defined(HAVE_DYLD)
- NSUnLinkModule(handle,FALSE);
+ NSUnLinkModule(handle,APR_FALSE);
#else
dlclose(handle);
1.13 +5 -5 apache-2.0/src/os/win32/main_win32.c
Index: main_win32.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/main_win32.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- main_win32.c 2000/04/14 15:59:17 1.12
+++ main_win32.c 2000/04/28 06:49:53 1.13
@@ -144,7 +144,7 @@
*/
EventName = ap_pstrcat(p,prefix,"_",signal,NULL);
printf("event name = %s\n", EventName);
- event = OpenEvent(EVENT_ALL_ACCESS, FALSE, EventName);
+ event = OpenEvent(EVENT_ALL_ACCESS, APR_FALSE, EventName);
printf("event handle = %d\n", event);
if (event == NULL) {
printf("Unable to open event %s.\n", EventName);
@@ -174,8 +174,8 @@
char cwd[MAX_STRING_LEN];
char **new;
- BOOLEAN install = FALSE;
- BOOLEAN uninstall = FALSE;
+ BOOLEAN install = APR_FALSE;
+ BOOLEAN uninstall = APR_FALSE;
ap_status_t status;
ap_array_header_t *cmdtbl;
@@ -225,10 +225,10 @@
signal = ap_optarg;
break;
case 'i':
- install = TRUE;
+ install = APR_TRUE;
break;
case 'u':
- uninstall = TRUE;
+ uninstall = APR_TRUE;
break;
case 'n':
service_name = ap_pstrdup(pwincmd, ap_optarg);
1.9 +16 -16 apache-2.0/src/os/win32/mod_isapi.c
Index: mod_isapi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/mod_isapi.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_isapi.c 2000/04/28 05:41:36 1.8
+++ mod_isapi.c 2000/04/28 06:49:53 1.9
@@ -348,15 +348,15 @@
if (strlen(result) > *lpdwSizeofBuffer) {
*lpdwSizeofBuffer = strlen(result);
SetLastError(ERROR_INSUFFICIENT_BUFFER);
- return FALSE;
+ return APR_FALSE;
}
strncpy(lpvBuffer, result, *lpdwSizeofBuffer);
- return TRUE;
+ return APR_TRUE;
}
/* Didn't find it */
SetLastError(ERROR_INVALID_INDEX);
- return FALSE;
+ return APR_FALSE;
}
BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
@@ -370,22 +370,22 @@
ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r,
"ISAPI asynchronous I/O not supported: %s", r->filename);
SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
+ return APR_FALSE;
}
if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) {
SetLastError(WSAEDISCON); /* TODO: Find the right error code */
- return FALSE;
+ return APR_FALSE;
}
*lpwdwBytes = writ;
- return TRUE;
+ return APR_TRUE;
}
BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
{
/* Doesn't need to do anything; we've read all the data already */
- return TRUE;
+ return APR_TRUE;
}
/* XXX: There is an O(n^2) attack possible here. */
@@ -404,7 +404,7 @@
*/
ap_table_set (r->headers_out, "Location", lpvBuffer);
cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT;
- return TRUE;
+ return APR_TRUE;
case HSE_REQ_SEND_URL:
/* Read any additional input */
@@ -423,7 +423,7 @@
ap_table_unset(r->headers_in, "Content-Length");
ap_internal_redirect((char *)lpvBuffer, r);
- return TRUE;
+ return APR_TRUE;
case HSE_REQ_SEND_RESPONSE_HEADER:
r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
@@ -439,7 +439,7 @@
*/
if (!lpdwDataType) {
ap_send_http_header(r);
- return TRUE;
+ return APR_TRUE;
}
/* Make a copy - don't disturb the original */
@@ -458,7 +458,7 @@
ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
"ISA sent invalid headers: %s", r->filename);
SetLastError(TODO_ERROR);
- return FALSE;
+ return APR_FALSE;
}
/* Get rid of \n and \r */
@@ -480,7 +480,7 @@
SetLastError(TODO_ERROR);
ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r,
"ISA sent invalid headers", r->filename);
- return FALSE;
+ return APR_FALSE;
}
*value++ = '\0';
@@ -532,7 +532,7 @@
/* Any data left should now be sent directly */
ap_rputs(data, r);
- return TRUE;
+ return APR_TRUE;
case HSE_REQ_MAP_URL_TO_PATH:
/* Map a URL to a filename */
@@ -550,13 +550,13 @@
((char *)lpvBuffer)[l + 1] = '\0';
}
- return TRUE;
+ return APR_TRUE;
case HSE_REQ_DONE_WITH_SESSION:
/* Do nothing... since we don't support async I/O, they'll
* return from HttpExtensionProc soon
*/
- return TRUE;
+ return APR_TRUE;
/* We don't support all this async I/O, Microsoft-specific stuff */
case HSE_REQ_IO_COMPLETION:
@@ -565,7 +565,7 @@
"ISAPI asynchronous I/O not supported: %s", r->filename);
default:
SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
+ return APR_FALSE;
}
}
1.8 +11 -11 apache-2.0/src/os/win32/service.c
Index: service.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/service.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- service.c 2000/04/15 17:48:16 1.7
+++ service.c 2000/04/28 06:49:53 1.8
@@ -404,9 +404,9 @@
BOOL isProcessService() {
if( !AllocConsole() )
- return FALSE;
+ return APR_FALSE;
FreeConsole();
- return TRUE;
+ return APR_TRUE;
}
/* Determine is service_name is a valid service
@@ -423,13 +423,13 @@
if (!(schSCM = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS))) {
ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL,
"OpenSCManager failed");
- return FALSE;
+ return APR_FALSE;
}
if ((schSVC = OpenService(schSCM, service_name, SERVICE_ALL_ACCESS))) {
CloseServiceHandle(schSVC);
CloseServiceHandle(schSCM);
- return TRUE;
+ return APR_TRUE;
}
Err = GetLastError();
@@ -437,14 +437,14 @@
ap_log_error(APLOG_MARK, APLOG_ERR, Err, NULL,
"OpenService failed");
- return FALSE;
+ return APR_FALSE;
}
int send_signal_to_service(char *display_name, char *sig) {
SC_HANDLE schService;
SC_HANDLE schSCManager;
char service_name[256];
- int success = FALSE;
+ int success = APR_FALSE;
enum { start, restart, stop, unknown } action;
static char *param[] = { "start", "restart", "shutdown" };
@@ -457,7 +457,7 @@
if (action == unknown) {
printf("signal must be start, restart, or shutdown\n");
- return FALSE;
+ return APR_FALSE;
}
/* Remove spaces from display name to create service name */
@@ -525,8 +525,8 @@
}
if (QueryServiceStatus(schService, &globdat.ssStatus))
if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED)
- return TRUE;
- return FALSE;
+ return APR_TRUE;
+ return APR_FALSE;
}
int ap_start_service(SC_HANDLE schService) {
@@ -541,8 +541,8 @@
}
if (QueryServiceStatus(schService, &globdat.ssStatus))
if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING)
- return TRUE;
- return FALSE;
+ return APR_TRUE;
+ return APR_FALSE;
}
#endif /* WIN32 */
1.8 +10 -10 apache-2.0/src/os/win32/util_win32.c
Index: util_win32.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util_win32.c 2000/04/14 15:59:18 1.7
+++ util_win32.c 2000/04/28 06:49:53 1.8
@@ -65,7 +65,7 @@
#include "httpd.h"
#include "http_log.h"
-/* Returns TRUE if the input string is a string
+/* Returns APR_TRUE if the input string is a string
* of one or more '.' characters.
*/
static BOOL OnlyDots(char *pString)
@@ -73,13 +73,13 @@
char *c;
if (*pString == '\0')
- return FALSE;
+ return APR_FALSE;
for (c = pString;*c;c++)
if (*c != '.')
- return FALSE;
+ return APR_FALSE;
- return TRUE;
+ return APR_TRUE;
}
/* Accepts as input a pathname, and tries to match it to an
@@ -93,8 +93,8 @@
char buf[HUGE_STRING_LEN];
char *pInputName;
char *p, *q;
- BOOL bDone = FALSE;
- BOOL bFileExists = TRUE;
+ BOOL bDone = APR_FALSE;
+ BOOL bFileExists = APR_TRUE;
HANDLE hFind;
WIN32_FIND_DATA wfd;
@@ -119,7 +119,7 @@
/* If all we have is a drive letter, then we are done */
if (strlen(pInputName) == 2)
- bDone = TRUE;
+ bDone = APR_TRUE;
}
q = p;
@@ -156,7 +156,7 @@
*p = '\0';
if (strchr(q, '*') || strchr(q, '?'))
- bFileExists = FALSE;
+ bFileExists = APR_FALSE;
/* If the path exists so far, call FindFirstFile
* again. However, if this portion of the path contains
@@ -169,7 +169,7 @@
hFind = FindFirstFile(pInputName, &wfd);
if (hFind == INVALID_HANDLE_VALUE) {
- bFileExists = FALSE;
+ bFileExists = APR_FALSE;
}
else {
FindClose(hFind);
@@ -190,7 +190,7 @@
p = strchr(p, '\\');
}
else {
- bDone = TRUE;
+ bDone = APR_TRUE;
}
}
1.8 +1 -1 apache-2.0/src/os/win32/installer/installdll/install.c
Index: install.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- install.c 2000/04/24 19:59:26 1.7
+++ install.c 2000/04/28 06:49:54 1.8
@@ -720,5 +720,5 @@
{
if (fdwReason == DLL_PROCESS_ATTACH)
hInstance = hInstDLL;
- return TRUE;
+ return APR_TRUE;
}
1.3 +15 -15 apache-2.0/src/os/win32/installer/installdll/test/test.c
Index: test.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/test/test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test.c 2000/03/31 09:17:20 1.2
+++ test.c 2000/04/28 06:49:55 1.3
@@ -98,12 +98,12 @@
if (!hPrevInstance) {
if (!InitApplication(hInstance)) {
- return (FALSE);
+ return (APR_FALSE);
}
}
if (!InitInstance(hInstance, nCmdShow)) {
- return (FALSE);
+ return (APR_FALSE);
}
hAccelTable = LoadAccelerators (hInstance, szAppName);
@@ -158,13 +158,13 @@
NULL);
if (!hWnd) {
- return (FALSE);
+ return (APR_FALSE);
}
ShowWindow(hWnd, nCmdShow);
UpdateWindow(hWnd);
- return (TRUE);
+ return (APR_TRUE);
}
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -187,7 +187,7 @@
{
int rc;
- if (DialogBox(hInst, MAKEINTRESOURCE(IDD_SETDIRECTORY), hWnd, (DLGPROC)SetDirectory) == FALSE)
+ if (DialogBox(hInst, MAKEINTRESOURCE(IDD_SETDIRECTORY), hWnd, (DLGPROC)SetDirectory) == APR_FALSE)
break;
rc = BeforeExit(hWnd, szInstDir, szInstDir, szInstDir, NULL);
if (rc == 1) {
@@ -222,17 +222,17 @@
switch (message) {
case WM_INITDIALOG:
CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));
- return (TRUE);
+ return (APR_TRUE);
case WM_COMMAND:
if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
- EndDialog(hDlg, TRUE);
- return (TRUE);
+ EndDialog(hDlg, APR_TRUE);
+ return (APR_TRUE);
}
break;
}
- return FALSE;
+ return APR_FALSE;
}
LRESULT CALLBACK SetDirectory(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
@@ -244,22 +244,22 @@
SetDlgItemText(hDlg, IDC_DIRECTORY, szInstDir);
//SetFocus(GetDlgItem(hDlg, IDC_DIRECTORY));
- return (TRUE);
+ return (APR_TRUE);
case WM_COMMAND:
switch(LOWORD(wParam)) {
case IDCANCEL:
- EndDialog(hDlg, FALSE);
- return TRUE;
+ EndDialog(hDlg, APR_FALSE);
+ return APR_TRUE;
case IDOK:
GetDlgItemText(hDlg, IDC_DIRECTORY, szInstDir, sizeof(szInstDir));
- EndDialog(hDlg, TRUE);
- return TRUE;
+ EndDialog(hDlg, APR_TRUE);
+ return APR_TRUE;
}
break;
}
- return FALSE;
+ return APR_FALSE;
}
//
Re: cvs commit: apache-2.0/src/os/win32/installer/installdll/test test.c
Posted by Bill Stoddard <st...@raleigh.ibm.com>.
This was a good change for Apache core and modules, but not for APR and the MPMs IMHO.
Bill
> This patch breaks a lot of things. Now we are passing APR_TRUE on system calls that are
> platform dependent. See the Winnt MPM and a number of places in the Windows portion of
> APR.
>
>
> > dougm 00/04/27 23:49:55
> >
> > Modified: src/lib/apr/file_io/beos readwrite.c
>
>
Re: cvs commit: apache-2.0/src/os/win32/installer/installdll/testtest.c
Posted by Bill Stoddard <st...@raleigh.ibm.com>.
I think I've fixed my concerns with the Windows code.
Bill
----- Original Message -----
From: Doug MacEachern <do...@covalent.net>
To: <ne...@apache.org>
Sent: Friday, April 28, 2000 2:21 PM
Subject: Re: cvs commit: apache-2.0/src/os/win32/installer/installdll/testtest.c
> On Fri, 28 Apr 2000, Bill Stoddard wrote:
>
> > This patch breaks a lot of things. Now we are passing APR_TRUE on system calls that
are
> > platform dependent. See the Winnt MPM and a number of places in the Windows portion of
> > APR.
>
> ok, i will back this out, and just add the original patch to apr_general.h
> to TRUE/FALSE don't get redefined.
>
Re: cvs commit: apache-2.0/src/os/win32/installer/installdll/test
test.c
Posted by Doug MacEachern <do...@covalent.net>.
On Fri, 28 Apr 2000, Bill Stoddard wrote:
> This patch breaks a lot of things. Now we are passing APR_TRUE on system calls that are
> platform dependent. See the Winnt MPM and a number of places in the Windows portion of
> APR.
ok, i will back this out, and just add the original patch to apr_general.h
to TRUE/FALSE don't get redefined.
Re: cvs commit: apache-2.0/src/os/win32/installer/installdll/test test.c
Posted by Bill Stoddard <st...@raleigh.ibm.com>.
This patch breaks a lot of things. Now we are passing APR_TRUE on system calls that are
platform dependent. See the Winnt MPM and a number of places in the Windows portion of
APR.
> dougm 00/04/27 23:49:55
>
> Modified: src/lib/apr/file_io/beos readwrite.c