diff options
| -rw-r--r-- | include/apr_compat.h | 4 | ||||
| -rw-r--r-- | include/apr_fnmatch.h | 3 | ||||
| -rw-r--r-- | renames_pending | 2 | ||||
| -rw-r--r-- | strings/apr_fnmatch.c | 8 |
4 files changed, 12 insertions, 5 deletions
diff --git a/include/apr_compat.h b/include/apr_compat.h index 23a307ae0..3651eba80 100644 --- a/include/apr_compat.h +++ b/include/apr_compat.h @@ -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 */ diff --git a/include/apr_fnmatch.h b/include/apr_fnmatch.h index 0e2f4db9b..48fc4d9e7 100644 --- a/include/apr_fnmatch.h +++ b/include/apr_fnmatch.h @@ -83,6 +83,9 @@ APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, * @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 diff --git a/renames_pending b/renames_pending index 6f7406217..e961e6c65 100644 --- a/renames_pending +++ b/renames_pending @@ -16,8 +16,6 @@ apr_file_seek_where_t from apr_seek_where_t 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 diff --git a/strings/apr_fnmatch.c b/strings/apr_fnmatch.c index f9a20c262..782d42a72 100644 --- a/strings/apr_fnmatch.c +++ b/strings/apr_fnmatch.c @@ -210,7 +210,7 @@ static const char *rangematch(const char *pattern, int test, int flags) /* 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; @@ -241,3 +241,9 @@ APR_DECLARE(int) apr_is_fnmatch(const char *pattern) } return 0; } + +/* Deprecated */ +APR_DECLARE(int) apr_is_fnmatch(const char *pattern) +{ + return apr_fnmatch_test(pattern); +} |