You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/09/23 21:21:44 UTC
svn commit: r1000589 - /httpd/httpd/trunk/server/util_regex.c
Author: trawick
Date: Thu Sep 23 19:21:43 2010
New Revision: 1000589
URL: http://svn.apache.org/viewvc?rev=1000589&view=rev
Log:
fix Sun Studio type mismatch warnings
Modified:
httpd/httpd/trunk/server/util_regex.c
Modified: httpd/httpd/trunk/server/util_regex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_regex.c?rev=1000589&r1=1000588&r2=1000589&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_regex.c (original)
+++ httpd/httpd/trunk/server/util_regex.c Thu Sep 23 19:21:43 2010
@@ -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_compi
}
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_compi
}
}
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 {