aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2012-05-17 13:47:04 +0000
committerValentin Bartenev <vbart@nginx.com>2012-05-17 13:47:04 +0000
commit1c168c78757bc7f6d13000efa04311db6d30e953 (patch)
tree78e527e2ea2551562aa3a07c155b551f0d1e1a40 /src
parent1b4397443fa707bbfcafb86bb1b0bb326f6d3adf (diff)
downloadnginx-1c168c78757bc7f6d13000efa04311db6d30e953.tar.gz
nginx-1c168c78757bc7f6d13000efa04311db6d30e953.zip
Fixed the ngx_regex.h header file compatibility with C++.
Diffstat (limited to 'src')
-rw-r--r--src/core/ngx_regex.c6
-rw-r--r--src/core/ngx_regex.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ngx_regex.c b/src/core/ngx_regex.c
index 677f862bf..3771aab8e 100644
--- a/src/core/ngx_regex.c
+++ b/src/core/ngx_regex.c
@@ -152,7 +152,7 @@ ngx_regex_compile(ngx_regex_compile_t *rc)
return NGX_ERROR;
}
- rc->regex->pcre = re;
+ rc->regex->code = re;
/* do not study at runtime */
@@ -367,7 +367,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
i = 0;
}
- elts[i].regex->extra = pcre_study(elts[i].regex->pcre, opt, &errstr);
+ elts[i].regex->extra = pcre_study(elts[i].regex->code, opt, &errstr);
if (errstr != NULL) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
@@ -380,7 +380,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle)
int jit, n;
jit = 0;
- n = pcre_fullinfo(elts[i].regex->pcre, elts[i].regex->extra,
+ n = pcre_fullinfo(elts[i].regex->code, elts[i].regex->extra,
PCRE_INFO_JIT, &jit);
if (n != 0 || jit != 1) {
diff --git a/src/core/ngx_regex.h b/src/core/ngx_regex.h
index 55bd331bb..680486c81 100644
--- a/src/core/ngx_regex.h
+++ b/src/core/ngx_regex.h
@@ -21,7 +21,7 @@
typedef struct {
- pcre *pcre;
+ pcre *code;
pcre_extra *extra;
} ngx_regex_t;
@@ -50,7 +50,7 @@ void ngx_regex_init(void);
ngx_int_t ngx_regex_compile(ngx_regex_compile_t *rc);
#define ngx_regex_exec(re, s, captures, size) \
- pcre_exec(re->pcre, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \
+ pcre_exec(re->code, re->extra, (const char *) (s)->data, (s)->len, 0, 0, \
captures, size)
#define ngx_regex_exec_n "pcre_exec()"