From 950fb268a2b89f782d8f74278a3878651aa3df6f Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 13 Nov 2009 20:41:41 +0000 Subject: ngx_regex_exec() calling optimiztion: *) change NGX_REGEX_NO_MATCHED to PCRE_ERROR_NOMATCH *) declare ngx_regex_exec() as #define *) optimize SSI regex a little --- src/core/ngx_regex.c | 16 ---------------- src/core/ngx_regex.h | 9 ++++++--- 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'src/core') diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c index be2dae79b..c5a495209 100644 --- a/src/core/ngx_regex.c +++ b/src/core/ngx_regex.c @@ -98,22 +98,6 @@ ngx_regex_capture_count(ngx_regex_t *re) } -ngx_int_t -ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, ngx_int_t size) -{ - int rc; - - rc = pcre_exec(re, NULL, (const char *) s->data, s->len, 0, 0, - captures, size); - - if (rc == -1) { - return NGX_REGEX_NO_MATCHED; - } - - return rc; -} - - ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log) { diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h index e31470f9f..4a4857222 100644 --- a/src/core/ngx_regex.h +++ b/src/core/ngx_regex.h @@ -14,7 +14,7 @@ #include -#define NGX_REGEX_NO_MATCHED -1000 +#define NGX_REGEX_NO_MATCHED PCRE_ERROR_NOMATCH /* -1 */ #define NGX_REGEX_CASELESS PCRE_CASELESS @@ -30,8 +30,11 @@ void ngx_regex_init(void); ngx_regex_t *ngx_regex_compile(ngx_str_t *pattern, ngx_int_t options, ngx_pool_t *pool, ngx_str_t *err); ngx_int_t ngx_regex_capture_count(ngx_regex_t *re); -ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, int *captures, - ngx_int_t size); + +#define ngx_regex_exec(re, s, captures, size) \ + pcre_exec(re, NULL, (const char *) (s)->data, (s)->len, 0, 0, \ + captures, size) + ngx_int_t ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log); -- cgit