Welcome! Log In Create A New Profile

Advanced

[nginx] Core: ngx_regex.c style cleanup.

Maxim Dounin
December 24, 2021 05:12PM
details: https://hg.nginx.org/nginx/rev/060bf88d2473
branches:
changeset: 7979:060bf88d2473
user: Maxim Dounin <mdounin@mdounin.ru>
date: Sat Dec 25 01:07:12 2021 +0300
description:
Core: ngx_regex.c style cleanup.

Notably, ngx_pcre_pool and ngx_pcre_studies are renamed to ngx_regex_pool
and ngx_regex_studies, respectively.

diffstat:

src/core/ngx_regex.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)

diffs (113 lines):

diff -r 2ca57257252d -r 060bf88d2473 src/core/ngx_regex.c
--- a/src/core/ngx_regex.c Sat Dec 25 01:07:10 2021 +0300
+++ b/src/core/ngx_regex.c Sat Dec 25 01:07:12 2021 +0300
@@ -15,6 +15,9 @@ typedef struct {
} ngx_regex_conf_t;


+static ngx_inline void ngx_regex_malloc_init(ngx_pool_t *pool);
+static ngx_inline void ngx_regex_malloc_done(void);
+
static void * ngx_libc_cdecl ngx_regex_malloc(size_t size);
static void ngx_libc_cdecl ngx_regex_free(void *p);
static void ngx_regex_cleanup(void *data);
@@ -64,8 +67,8 @@ ngx_module_t ngx_regex_module = {
};


-static ngx_pool_t *ngx_pcre_pool;
-static ngx_list_t *ngx_pcre_studies;
+static ngx_pool_t *ngx_regex_pool;
+static ngx_list_t *ngx_regex_studies;


void
@@ -79,14 +82,14 @@ ngx_regex_init(void)
static ngx_inline void
ngx_regex_malloc_init(ngx_pool_t *pool)
{
- ngx_pcre_pool = pool;
+ ngx_regex_pool = pool;
}


static ngx_inline void
ngx_regex_malloc_done(void)
{
- ngx_pcre_pool = NULL;
+ ngx_regex_pool = NULL;
}


@@ -112,13 +115,13 @@ ngx_regex_compile(ngx_regex_compile_t *r
rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
"pcre_compile() failed: %s in \"%V\"",
errstr, &rc->pattern)
- - rc->err.data;
+ - rc->err.data;

} else {
rc->err.len = ngx_snprintf(rc->err.data, rc->err.len,
"pcre_compile() failed: %s in \"%V\" at \"%s\"",
errstr, &rc->pattern, rc->pattern.data + erroff)
- - rc->err.data;
+ - rc->err.data;
}

return NGX_ERROR;
@@ -133,8 +136,8 @@ ngx_regex_compile(ngx_regex_compile_t *r

/* do not study at runtime */

- if (ngx_pcre_studies != NULL) {
- elt = ngx_list_push(ngx_pcre_studies);
+ if (ngx_regex_studies != NULL) {
+ elt = ngx_list_push(ngx_regex_studies);
if (elt == NULL) {
goto nomem;
}
@@ -229,11 +232,8 @@ ngx_regex_exec_array(ngx_array_t *a, ngx
static void * ngx_libc_cdecl
ngx_regex_malloc(size_t size)
{
- ngx_pool_t *pool;
- pool = ngx_pcre_pool;
-
- if (pool) {
- return ngx_palloc(pool, size);
+ if (ngx_regex_pool) {
+ return ngx_palloc(ngx_regex_pool, size);
}

return NULL;
@@ -286,10 +286,10 @@ ngx_regex_cleanup(void *data)

/*
* On configuration parsing errors ngx_regex_module_init() will not
- * be called. Make sure ngx_pcre_studies is properly cleared anyway.
+ * be called. Make sure ngx_regex_studies is properly cleared anyway.
*/

- ngx_pcre_studies = NULL;
+ ngx_regex_studies = NULL;
}


@@ -357,7 +357,7 @@ ngx_regex_module_init(ngx_cycle_t *cycle

ngx_regex_malloc_done();

- ngx_pcre_studies = NULL;
+ ngx_regex_studies = NULL;

return NGX_OK;
}
@@ -389,7 +389,7 @@ ngx_regex_create_conf(ngx_cycle_t *cycle
return NULL;
}

- ngx_pcre_studies = rcf->studies;
+ ngx_regex_studies = rcf->studies;

return rcf;
}
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

[nginx] Core: ngx_regex.c style cleanup.

Maxim Dounin 184 December 24, 2021 05:12PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 107
Record Number of Users: 6 on February 13, 2018
Record Number of Guests: 421 on December 02, 2018
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready