wrowe 2002/07/08 10:41:26
Modified: . renames_pending
include apr_compat.h apr_fnmatch.h
strings apr_fnmatch.c
Log:
Rename to apr_fnmatch_test
Revision Changes Path
1.13 +0 -2 apr/renames_pending
Index: renames_pending
===================================================================
RCS file: /home/cvs/apr/renames_pending,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- renames_pending 8 Jul 2002 17:00:56 -0000 1.12
+++ renames_pending 8 Jul 2002 17:41:25 -0000 1.13
@@ -16,8 +16,6 @@
apr_filepath_name_get from apr_filename_of_pathname
-apr_fnmatch_test from apr_is_fnmatch
-
apr_lock_scope_e from apr_lockscope_e
apr_lock_type_e from apr_locktype_e
apr_lock_mech_e from apr_lockmech_e
1.17 +2 -2 apr/include/apr_compat.h
Index: apr_compat.h
===================================================================
RCS file: /home/cvs/apr/include/apr_compat.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_compat.h 8 Jun 2002 20:04:26 -0000 1.16
+++ apr_compat.h 8 Jul 2002 17:41:25 -0000 1.17
@@ -72,8 +72,8 @@
#define ap_init_alloc apr_pool_alloc_init
/** @deprecated @see apr_is_empty_table */
#define ap_is_empty_table apr_is_empty_table
-/** @deprecated @see apr_is_fnmatch */
-#define ap_is_fnmatch apr_is_fnmatch
+/** @deprecated @see apr_fnmatch_test */
+#define ap_is_fnmatch apr_fnmatch_test
/** @deprecated @see apr_pool_cleanup_kill */
#define ap_kill_cleanup apr_pool_cleanup_kill
/** @deprecated @see apr_array_make */
1.17 +3 -0 apr/include/apr_fnmatch.h
Index: apr_fnmatch.h
===================================================================
RCS file: /home/cvs/apr/include/apr_fnmatch.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_fnmatch.h 19 Mar 2002 19:55:51 -0000 1.16
+++ apr_fnmatch.h 8 Jul 2002 17:41:25 -0000 1.17
@@ -83,6 +83,9 @@
* @param pattern The pattern to search for glob characters.
* @return non-zero if pattern has any glob characters in it
*/
+APR_DECLARE(int) apr_fnmatch_test(const char *pattern);
+
+/** @deprecated @see apr_fnmatch_test */
APR_DECLARE(int) apr_is_fnmatch(const char *pattern);
#ifdef __cplusplus
1.6 +7 -1 apr/strings/apr_fnmatch.c
Index: apr_fnmatch.c
===================================================================
RCS file: /home/cvs/apr/strings/apr_fnmatch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr_fnmatch.c 25 Feb 2001 20:39:37 -0000 1.5
+++ apr_fnmatch.c 8 Jul 2002 17:41:25 -0000 1.6
@@ -210,7 +210,7 @@
/* This function is an Apache addition */
/* return non-zero if pattern has any glob chars in it */
-APR_DECLARE(int) apr_is_fnmatch(const char *pattern)
+APR_DECLARE(int) apr_fnmatch_test(const char *pattern)
{
int nesting;
@@ -240,4 +240,10 @@
++pattern;
}
return 0;
+}
+
+/* Deprecated */
+APR_DECLARE(int) apr_is_fnmatch(const char *pattern)
+{
+ return apr_fnmatch_test(pattern);
}
