www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-30 20:03:10 +03:00
Code Activity

fix Sun Studio type mismatch warnings

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1000589 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2010-09-23 19:21:43 +00:00
parent 279fb735bf
commit 9fa6b628a5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/util_regex.c
View File

@ -22,6 +22,12 @@
#include "ap_regex.h" #include "ap_regex.h"
#include "httpd.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, AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
const char *pattern) 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 (!endp) { /* there's no delim or flags */
if (ap_regcomp(&ret->rx, pattern, 0) == 0) { 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); apr_pool_cleanup_null);
return ret; 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) { 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); apr_pool_cleanup_null);
} }
else { else {