diff options
| author | Jeff Trawick <trawick@apache.org> | 2010-09-23 21:21:43 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2010-09-23 21:21:43 +0200 |
| commit | 9fa6b628a5859f1c6149e5793e783cd98b6731ee (patch) | |
| tree | f11a387986bfbe01d657fd52ccacc857b51ef9b6 /server/util_regex.c | |
| parent | generated files only (diff) | |
| download | apache2-9fa6b628a5859f1c6149e5793e783cd98b6731ee.tar.xz apache2-9fa6b628a5859f1c6149e5793e783cd98b6731ee.zip | |
fix Sun Studio type mismatch warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1000589 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_regex.c')
| -rw-r--r-- | server/util_regex.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/server/util_regex.c b/server/util_regex.c index 2175d22b8a..73eccec761 100644 --- a/server/util_regex.c +++ b/server/util_regex.c @@ -22,6 +22,12 @@ #include "ap_regex.h" #include "httpd.h" +static apr_status_t rxplus_cleanup(void *preg) +{ + ap_regfree((ap_regex_t *) preg); + return APR_SUCCESS; +} + AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool, const char *pattern) { @@ -61,7 +67,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool, } if (!endp) { /* there's no delim or flags */ if (ap_regcomp(&ret->rx, pattern, 0) == 0) { - apr_pool_cleanup_register(pool, &ret->rx, (void*) ap_regfree, + apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup, apr_pool_cleanup_null); return ret; } @@ -100,7 +106,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool, } } if (ap_regcomp(&ret->rx, rxstr, ret->flags) == 0) { - apr_pool_cleanup_register(pool, &ret->rx, (void*) ap_regfree, + apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup, apr_pool_cleanup_null); } else { |