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

Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order to save a few cycles.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1719018 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2015-12-10 06:52:10 +00:00
parent 60964353d5
commit ee9f87c2c2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/util_regex.c
View File

@ -46,6 +46,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
ap_rxplus_t *ret = apr_pcalloc(pool, sizeof(ap_rxplus_t)); ap_rxplus_t *ret = apr_pcalloc(pool, sizeof(ap_rxplus_t));
char delim = 0; char delim = 0;
enum { SUBSTITUTE = 's', MATCH = 'm'} action = MATCH; enum { SUBSTITUTE = 's', MATCH = 'm'} action = MATCH;
if (!apr_isalnum(pattern[0])) { if (!apr_isalnum(pattern[0])) {
delim = *str++; delim = *str++;
} }
@ -65,7 +66,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
if (delim) { if (delim) {
endp = ap_strchr_c(str, delim); endp = ap_strchr_c(str, delim);
} }
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, rxplus_cleanup, apr_pool_cleanup_register(pool, &ret->rx, rxplus_cleanup,
apr_pool_cleanup_null); apr_pool_cleanup_null);
@ -77,7 +78,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
} }
/* We have a delimiter. Use it to extract the regexp */ /* We have a delimiter. Use it to extract the regexp */
rxstr = apr_pstrndup(pool, str, endp-str); rxstr = apr_pstrmemdup(pool, str, endp-str);
/* If it's a substitution, we need the replacement string /* If it's a substitution, we need the replacement string
* TODO: possible future enhancement - support other parsing * TODO: possible future enhancement - support other parsing
@ -89,7 +90,7 @@ AP_DECLARE(ap_rxplus_t*) ap_rxplus_compile(apr_pool_t *pool,
/* missing replacement string is an error */ /* missing replacement string is an error */
return NULL; return NULL;
} }
ret->subs = apr_pstrndup(pool, str, (endp-str)); ret->subs = apr_pstrmemdup(pool, str, endp-str);
} }
/* anything after the current delimiter is flags */ /* anything after the current delimiter is flags */