Style.

diff --git a/njs/njs_lexer_keyword.c b/njs/njs_lexer_keyword.c
index 0b52156331ab9c02174262b6afb6bb8bb02bdf69..8699191a0046fa6820dcdfb039e5b71bc664afca 100644 (file)
--- a/njs/njs_lexer_keyword.c
+++ b/njs/njs_lexer_keyword.c
@@ -142,7 +142,7 @@ const nxt_lvlhsh_proto_t  njs_keyword_hash_proto
 
 
 nxt_int_t
-njs_lexer_keywords_init(nxt_mp_t *mcp, nxt_lvlhsh_t *hash)
+njs_lexer_keywords_init(nxt_mp_t *mp, nxt_lvlhsh_t *hash)
 {
     nxt_uint_t           n;
     nxt_lvlhsh_query_t   lhq;
@@ -153,7 +153,7 @@ njs_lexer_keywords_init(nxt_mp_t *mcp, nxt_lvlhsh_t *hash)
 
     lhq.replace = 0;
     lhq.proto = &njs_keyword_hash_proto;
-    lhq.pool = mcp;
+    lhq.pool = mp;
 
     do {
         lhq.key_hash = nxt_djb_hash(keyword->name.start, keyword->name.length);

diff --git a/njs/njs_parser.h b/njs/njs_parser.h
index 501e806e771d874dbb9bbae07f6ef5fb2f4c2eaa..70af65148a452a4d80004359890d2b0c70a0899a 100644 (file)
--- a/njs/njs_parser.h
+++ b/njs/njs_parser.h
@@ -310,7 +310,7 @@ typedef struct {
 njs_token_t njs_lexer_token(njs_lexer_t *lexer);
 void njs_lexer_rollback(njs_lexer_t *lexer);
 njs_token_t njs_lexer_peek_token(njs_lexer_t *lexer);
-nxt_int_t njs_lexer_keywords_init(nxt_mp_t *mcp, nxt_lvlhsh_t *hash);
+nxt_int_t njs_lexer_keywords_init(nxt_mp_t *mp, nxt_lvlhsh_t *hash);
 njs_token_t njs_lexer_keyword(njs_lexer_t *lexer);
 
 nxt_int_t njs_parser(njs_vm_t *vm, njs_parser_t *parser,

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index f543552d934de4a93514d58c5567729311d62052..04dd5c8eab5de633529c68dbfe2250fa11ed7656 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -175,7 +175,7 @@ njs_reference_hash_test(nxt_lvlhsh_query_t *lhq, void *data)
 }
 
 
-const nxt_lvlhsh_proto_t  njs_reference_hash_proto
+const nxt_lvlhsh_proto_t  njs_references_hash_proto
     nxt_aligned(64) =
 {
     NXT_LVLHSH_DEFAULT,
@@ -205,7 +205,7 @@ njs_variable_reference(njs_vm_t *vm, njs_parser_scope_t *scope,
 
         lhq.key_hash = hash;
         lhq.key = vr->name;
-        lhq.proto = &njs_reference_hash_proto;
+        lhq.proto = &njs_references_hash_proto;
         lhq.replace = 0;
         lhq.value = node;
         lhq.pool = vm->mem_pool;