On Wed, Feb 05, 2003 at 11:45:28PM -0500, Rodent of Unusual Size wrote:
> apr_fnmatch.h (FNM_foo)
> apr_general.h (MAXIMUM_WAIT_OBJECTS)
> apr_network_io.h (MAX_SECONDS_TO_LINGER)
OK, here's a patch.
--
Craig Rodrigues
http://home.attbi.com/~rodrigc
[EMAIL PROTECTED]
Index: include/apr_fnmatch.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_fnmatch.h,v
retrieving revision 1.17
diff -u -r1.17 apr_fnmatch.h
--- include/apr_fnmatch.h 8 Jul 2002 17:41:25 -0000 1.17
+++ include/apr_fnmatch.h 6 Feb 2003 06:04:33 -0000
@@ -53,25 +53,25 @@
extern "C" {
#endif
-#define FNM_NOMATCH 1 /**< Match failed. */
+#define APR_FNM_NOMATCH 1 /**< Match failed. */
-#define FNM_NOESCAPE 0x01 /**< Disable backslash escaping. */
-#define FNM_PATHNAME 0x02 /**< Slash must be matched by slash. */
-#define FNM_PERIOD 0x04 /**< Period must be matched by period. */
+#define APR_FNM_NOESCAPE 0x01 /**< Disable backslash escaping. */
+#define APR_FNM_PATHNAME 0x02 /**< Slash must be matched by slash. */
+#define APR_FNM_PERIOD 0x04 /**< Period must be matched by period. */
-#define FNM_CASE_BLIND 0x08 /**< Compare characters case-insensitively. @remark This flag is an Apache addition */
+#define APR_FNM_CASE_BLIND 0x08 /**< Compare characters case-insensitively. @remark This flag is an Apache addition */
/**
* Try to match the string to the given pattern, return APR_SUCCESS if
- * match, else return FNM_NOMATCH.
+ * match, else return APR_FNM_NOMATCH.
* @param pattern The pattern to match to
* @param strings The string we are trying to match
* @param flags flags to use in the match. Bitwise OR of:
* <PRE>
- * FNM_NOESCAPE Disable backslash escaping
- * FNM_PATHNAME Slash must be matched by slash
- * FNM_PERIOD Period must be matched by period
- * FNM_CASE_BLIND Compare characters case-insensitively.
+ * APR_FNM_NOESCAPE Disable backslash escaping
+ * APR_FNM_PATHNAME Slash must be matched by slash
+ * APR_FNM_PERIOD Period must be matched by period
+ * APR_FNM_CASE_BLIND Compare characters case-insensitively.
* </PRE>
*/
Index: include/apr_general.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_general.h,v
retrieving revision 1.78
diff -u -r1.78 apr_general.h
--- include/apr_general.h 13 Jan 2003 18:23:09 -0000 1.78
+++ include/apr_general.h 6 Feb 2003 06:04:33 -0000
@@ -87,14 +87,14 @@
/**
* The Win32 call WaitForMultipleObjects will only allow you to wait for
- * a maximum of MAXIMUM_WAIT_OBJECTS (current 64). Since the threading
+ * a maximum of APR_MAXIMUM_WAIT_OBJECTS (current 64). Since the threading
* model in the multithreaded version of apache wants to use this call,
* we are restricted to a maximum of 64 threads.
* @see wait_for_many_objects for a way to increase this size
*/
-#ifndef MAXIMUM_WAIT_OBJECTS
-#define MAXIMUM_WAIT_OBJECTS 64
+#ifndef APR_MAXIMUM_WAIT_OBJECTS
+#define APR_MAXIMUM_WAIT_OBJECTS 64
#endif
/** a space */
Index: include/apr_network_io.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_network_io.h,v
retrieving revision 1.136
diff -u -r1.136 apr_network_io.h
--- include/apr_network_io.h 1 Jan 2003 00:01:45 -0000 1.136
+++ include/apr_network_io.h 6 Feb 2003 06:04:34 -0000
@@ -78,9 +78,9 @@
extern "C" {
#endif /* __cplusplus */
-#ifndef MAX_SECS_TO_LINGER
+#ifndef APR_MAX_SECS_TO_LINGER
/** Maximum seconds to linger */
-#define MAX_SECS_TO_LINGER 30
+#define APR_MAX_SECS_TO_LINGER 30
#endif
#ifndef APRMAXHOSTLEN
Index: network_io/os2/sockopt.c
===================================================================
RCS file: /home/cvspublic/apr/network_io/os2/sockopt.c,v
retrieving revision 1.32
diff -u -r1.32 sockopt.c
--- network_io/os2/sockopt.c 6 Jan 2003 23:44:34 -0000 1.32
+++ network_io/os2/sockopt.c 6 Feb 2003 06:04:35 -0000
@@ -115,7 +115,7 @@
}
if (opt & APR_SO_LINGER) {
li.l_onoff = on;
- li.l_linger = MAX_SECS_TO_LINGER;
+ li.l_linger = APR_MAX_SECS_TO_LINGER;
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) {
return APR_OS2_STATUS(sock_errno());
}
Index: network_io/unix/sockopt.c
===================================================================
RCS file: /home/cvspublic/apr/network_io/unix/sockopt.c,v
retrieving revision 1.65
diff -u -r1.65 sockopt.c
--- network_io/unix/sockopt.c 6 Jan 2003 23:44:35 -0000 1.65
+++ network_io/unix/sockopt.c 6 Feb 2003 06:04:35 -0000
@@ -215,7 +215,7 @@
if (apr_is_option_set(sock->netmask, APR_SO_LINGER) != on) {
struct linger li;
li.l_onoff = on;
- li.l_linger = MAX_SECS_TO_LINGER;
+ li.l_linger = APR_MAX_SECS_TO_LINGER;
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) {
return errno;
}
Index: network_io/win32/sockopt.c
===================================================================
RCS file: /home/cvspublic/apr/network_io/win32/sockopt.c,v
retrieving revision 1.51
diff -u -r1.51 sockopt.c
--- network_io/win32/sockopt.c 6 Jan 2003 23:44:36 -0000 1.51
+++ network_io/win32/sockopt.c 6 Feb 2003 06:04:35 -0000
@@ -183,7 +183,7 @@
if (apr_is_option_set(sock->netmask, APR_SO_LINGER) != on) {
struct linger li;
li.l_onoff = on;
- li.l_linger = MAX_SECS_TO_LINGER;
+ li.l_linger = APR_MAX_SECS_TO_LINGER;
if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER,
(char *) &li, sizeof(struct linger)) == -1) {
return apr_get_netos_error();
Index: strings/apr_fnmatch.c
===================================================================
RCS file: /home/cvspublic/apr/strings/apr_fnmatch.c,v
retrieving revision 1.6
diff -u -r1.6 apr_fnmatch.c
--- strings/apr_fnmatch.c 8 Jul 2002 17:41:25 -0000 1.6
+++ strings/apr_fnmatch.c 6 Feb 2003 06:04:36 -0000
@@ -64,18 +64,18 @@
for (stringstart = string;;) {
switch (c = *pattern++) {
case EOS:
- return (*string == EOS ? APR_SUCCESS : FNM_NOMATCH);
+ return (*string == EOS ? APR_SUCCESS : APR_FNM_NOMATCH);
case '?':
if (*string == EOS) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
- if (*string == '/' && (flags & FNM_PATHNAME)) {
- return (FNM_NOMATCH);
+ if (*string == '/' && (flags & APR_FNM_PATHNAME)) {
+ return (APR_FNM_NOMATCH);
}
- if (*string == '.' && (flags & FNM_PERIOD) &&
+ if (*string == '.' && (flags & APR_FNM_PERIOD) &&
(string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) {
- return (FNM_NOMATCH);
+ ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
+ return (APR_FNM_NOMATCH);
}
++string;
break;
@@ -86,58 +86,58 @@
c = *++pattern;
}
- if (*string == '.' && (flags & FNM_PERIOD) &&
+ if (*string == '.' && (flags & APR_FNM_PERIOD) &&
(string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) {
- return (FNM_NOMATCH);
+ ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
+ return (APR_FNM_NOMATCH);
}
/* Optimize for pattern with * at end or before /. */
if (c == EOS) {
- if (flags & FNM_PATHNAME) {
- return (strchr(string, '/') == NULL ? APR_SUCCESS : FNM_NOMATCH);
+ if (flags & APR_FNM_PATHNAME) {
+ return (strchr(string, '/') == NULL ? APR_SUCCESS : APR_FNM_NOMATCH);
}
else {
return (APR_SUCCESS);
}
}
- else if (c == '/' && flags & FNM_PATHNAME) {
+ else if (c == '/' && flags & APR_FNM_PATHNAME) {
if ((string = strchr(string, '/')) == NULL) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
break;
}
/* General case, use recursion. */
while ((test = *string) != EOS) {
- if (!apr_fnmatch(pattern, string, flags & ~FNM_PERIOD)) {
+ if (!apr_fnmatch(pattern, string, flags & ~APR_FNM_PERIOD)) {
return (APR_SUCCESS);
}
- if (test == '/' && flags & FNM_PATHNAME) {
+ if (test == '/' && flags & APR_FNM_PATHNAME) {
break;
}
++string;
}
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
case '[':
if (*string == EOS) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
- if (*string == '/' && flags & FNM_PATHNAME) {
- return (FNM_NOMATCH);
+ if (*string == '/' && flags & APR_FNM_PATHNAME) {
+ return (APR_FNM_NOMATCH);
}
- if (*string == '.' && (flags & FNM_PERIOD) &&
+ if (*string == '.' && (flags & APR_FNM_PERIOD) &&
(string == stringstart ||
- ((flags & FNM_PATHNAME) && *(string - 1) == '/'))) {
- return (FNM_NOMATCH);
+ ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
+ return (APR_FNM_NOMATCH);
}
if ((pattern = rangematch(pattern, *string, flags)) == NULL) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
++string;
break;
case '\\':
- if (!(flags & FNM_NOESCAPE)) {
+ if (!(flags & APR_FNM_NOESCAPE)) {
if ((c = *pattern++) == EOS) {
c = '\\';
--pattern;
@@ -145,13 +145,13 @@
}
/* FALLTHROUGH */
default:
- if (flags & FNM_CASE_BLIND) {
+ if (flags & APR_FNM_CASE_BLIND) {
if (apr_tolower(c) != apr_tolower(*string)) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
}
else if (c != *string) {
- return (FNM_NOMATCH);
+ return (APR_FNM_NOMATCH);
}
string++;
break;
@@ -177,7 +177,7 @@
}
for (ok = 0; (c = *pattern++) != ']';) {
- if (c == '\\' && !(flags & FNM_NOESCAPE)) {
+ if (c == '\\' && !(flags & APR_FNM_NOESCAPE)) {
c = *pattern++;
}
if (c == EOS) {
@@ -185,21 +185,21 @@
}
if (*pattern == '-' && (c2 = *(pattern + 1)) != EOS && c2 != ']') {
pattern += 2;
- if (c2 == '\\' && !(flags & FNM_NOESCAPE)) {
+ if (c2 == '\\' && !(flags & APR_FNM_NOESCAPE)) {
c2 = *pattern++;
}
if (c2 == EOS) {
return (NULL);
}
if ((c <= test && test <= c2)
- || ((flags & FNM_CASE_BLIND)
+ || ((flags & APR_FNM_CASE_BLIND)
&& ((apr_tolower(c) <= apr_tolower(test))
&& (apr_tolower(test) <= apr_tolower(c2))))) {
ok = 1;
}
}
else if ((c == test)
- || ((flags & FNM_CASE_BLIND)
+ || ((flags & APR_FNM_CASE_BLIND)
&& (apr_tolower(c) == apr_tolower(test)))) {
ok = 1;
}
