Adding const qualifiers to njs_string_prototype_split() and friends.

diff --git a/njs/njs.h b/njs/njs.h
index 6d9a03d3f9a3ad75dc1b5c1bd9d3e027b340a7f0..90db2bb2203664f179e4f7f359b4c9a5dfe01898 100644 (file)
--- a/njs/njs.h
+++ b/njs/njs.h
@@ -232,7 +232,7 @@ NXT_EXPORT void njs_vm_retval_set(njs_vm_t *vm, const njs_value_t *value);
 NXT_EXPORT u_char * njs_string_alloc(njs_vm_t *vm, njs_value_t *value,
     uint32_t size, uint32_t length);
 NXT_EXPORT njs_ret_t njs_string_create(njs_vm_t *vm, njs_value_t *value,
-    u_char *start, uint32_t size, uint32_t length);
+    const u_char *start, uint32_t size, uint32_t length);
 
 NXT_EXPORT nxt_int_t njs_value_string_copy(njs_vm_t *vm, nxt_str_t *retval,
     const njs_value_t *value, uintptr_t *next);

diff --git a/njs/njs_array.c b/njs/njs_array.c
index 834c1053e5aa0be22473f5111c9b256f8f672cfc..8866d22f3de095a82e17e8c43ed980f323e75c29 100644 (file)
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -184,7 +184,7 @@ njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value)
 
 
 njs_ret_t
-njs_array_string_add(njs_vm_t *vm, njs_array_t *array, u_char *start,
+njs_array_string_add(njs_vm_t *vm, njs_array_t *array, const u_char *start,
     size_t size, size_t length)
 {
     njs_ret_t  ret;

diff --git a/njs/njs_array.h b/njs/njs_array.h
index 7b6e7c109bebea938269d37e0cab27b392d1e718..d2c06f7a4c91e012f5b83c35a3b981a339a92c98 100644 (file)
--- a/njs/njs_array.h
+++ b/njs/njs_array.h
@@ -17,8 +17,8 @@
 
 njs_array_t *njs_array_alloc(njs_vm_t *vm, uint32_t length, uint32_t spare);
 njs_ret_t njs_array_add(njs_vm_t *vm, njs_array_t *array, njs_value_t *value);
-njs_ret_t njs_array_string_add(njs_vm_t *vm, njs_array_t *array, u_char *start,
-    size_t size, size_t length);
+njs_ret_t njs_array_string_add(njs_vm_t *vm, njs_array_t *array,
+    const u_char *start, size_t size, size_t length);
 njs_ret_t njs_array_expand(njs_vm_t *vm, njs_array_t *array, uint32_t prepend,
     uint32_t size);
 njs_ret_t njs_array_constructor(njs_vm_t *vm, njs_value_t *args,

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 0eb99856d40bb2571bbd9c9176b516d6fd421b5e..67825dacf84809a90f5a21f89c26690b11209f6a 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -389,8 +389,8 @@ njs_regexp_compile_trace_handler(nxt_trace_t *trace, nxt_trace_data_t *td,
 
 
 nxt_int_t
-njs_regexp_match(njs_vm_t *vm, nxt_regex_t *regex, u_char *subject, size_t len,
-    nxt_regex_match_data_t *match_data)
+njs_regexp_match(njs_vm_t *vm, nxt_regex_t *regex, const u_char *subject,
+    size_t len, nxt_regex_match_data_t *match_data)
 {
     nxt_int_t            ret;
     nxt_trace_handler_t  handler;

diff --git a/njs/njs_regexp.h b/njs/njs_regexp.h
index 8febede4af5cfee7bf5f0d99bb7dcf143c44c123..42ed42639d483d3b743c6e4096d4a79681d462c7 100644 (file)
--- a/njs/njs_regexp.h
+++ b/njs/njs_regexp.h
@@ -25,8 +25,8 @@ njs_token_t njs_regexp_literal(njs_vm_t *vm, njs_parser_t *parser,
     njs_value_t *value);
 njs_regexp_pattern_t *njs_regexp_pattern_create(njs_vm_t *vm,
     u_char *string, size_t length, njs_regexp_flags_t flags);
-nxt_int_t njs_regexp_match(njs_vm_t *vm, nxt_regex_t *regex, u_char *subject,
-    size_t len, nxt_regex_match_data_t *match_data);
+nxt_int_t njs_regexp_match(njs_vm_t *vm, nxt_regex_t *regex,
+    const u_char *subject, size_t len, nxt_regex_match_data_t *match_data);
 njs_regexp_t *njs_regexp_alloc(njs_vm_t *vm, njs_regexp_pattern_t *pattern);
 njs_ret_t njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args,
     nxt_uint_t nargs, njs_index_t unused);

diff --git a/njs/njs_string.c b/njs/njs_string.c
index b537e7b0357383e8be60cf412a1d7cde144d4781..8b49d4d5e2c1f4085601eb366dd88a934033af5d 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -77,7 +77,7 @@ static njs_ret_t njs_string_prototype_pad(njs_vm_t *vm, njs_value_t *args,
 static njs_ret_t njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args,
     njs_regexp_pattern_t *pattern);
 static njs_ret_t njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array,
-    njs_utf8_t utf8, u_char *start, size_t size);
+    njs_utf8_t utf8, const u_char *start, size_t size);
 static njs_ret_t njs_string_replace_regexp(njs_vm_t *vm, njs_value_t *args,
     njs_string_replace_t *r);
 static njs_ret_t njs_string_replace_regexp_function(njs_vm_t *vm,
@@ -111,10 +111,11 @@ static njs_ret_t njs_string_decode(njs_vm_t *vm, njs_value_t *value,
 
 
 njs_ret_t
-njs_string_create(njs_vm_t *vm, njs_value_t *value, u_char *start,
+njs_string_create(njs_vm_t *vm, njs_value_t *value, const u_char *start,
     uint32_t size, uint32_t length)
 {
-    u_char        *dst, *src;
+    u_char        *dst;
+    const u_char  *src;
     njs_string_t  *string;
 
     value->type = NJS_STRING;
@@ -153,7 +154,7 @@ njs_string_create(njs_vm_t *vm, njs_value_t *value, u_char *start,
 
         value->long_string.data = string;
 
-        string->start = start;
+        string->start = (u_char *) start;
         string->length = length;
         string->retain = 1;
     }
@@ -2729,12 +2730,11 @@ njs_string_prototype_split(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     njs_index_t unused)
 {
     int                   ret, *captures;
-    u_char                *p, *start, *next;
     size_t                size;
     uint32_t              limit;
     njs_utf8_t            utf8;
     njs_array_t           *array;
-    const u_char          *end;
+    const u_char          *p, *start, *next, *end;
     njs_regexp_utf8_t     type;
     njs_string_prop_t     string, split;
     njs_regexp_pattern_t  *pattern;
@@ -2887,7 +2887,7 @@ done:
 
 static njs_ret_t
 njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array, njs_utf8_t utf8,
-    u_char *start, size_t size)
+    const u_char *start, size_t size)
 {
     ssize_t  length;
 

diff --git a/njs/njs_string.h b/njs/njs_string.h
index da077edc4dc36bc3ae9f1a8b19bbcd269aa54965..c6d33db55cbfa500107bf888d195111e220d51ad 100644 (file)
--- a/njs/njs_string.h
+++ b/njs/njs_string.h
@@ -100,7 +100,7 @@ typedef enum {
 
 
 nxt_inline uint32_t
-njs_string_length(njs_utf8_t utf8, u_char *start, size_t size)
+njs_string_length(njs_utf8_t utf8, const u_char *start, size_t size)
 {
     ssize_t  length;
 

diff --git a/nxt/nxt_pcre.c b/nxt/nxt_pcre.c
index 4d9cdc28bcf3b488da2281971d6b5b26adedcb58..be5f7e1fb834698add893f15eda583efacda20d4 100644 (file)
--- a/nxt/nxt_pcre.c
+++ b/nxt/nxt_pcre.c
@@ -209,13 +209,13 @@ nxt_pcre_default_free(void *p, void *memory_data)
 
 
 nxt_int_t
-nxt_regex_match(nxt_regex_t *regex, u_char *subject, size_t len,
+nxt_regex_match(nxt_regex_t *regex, const u_char *subject, size_t len,
     nxt_regex_match_data_t *match_data, nxt_regex_context_t *ctx)
 {
     int  ret;
 
-    ret = pcre_exec(regex->code, regex->extra, (char *) subject, len, 0, 0,
-                    match_data->captures, match_data->ncaptures);
+    ret = pcre_exec(regex->code, regex->extra, (const char *) subject, len,
+                    0, 0, match_data->captures, match_data->ncaptures);
 
     /* PCRE_ERROR_NOMATCH is -1. */
 

diff --git a/nxt/nxt_regex.h b/nxt/nxt_regex.h
index 4178a03e8dae55b6e1518a5c8a024561112b03d3..6accc6a2285594b4916ecead8a091045336abcff 100644 (file)
--- a/nxt/nxt_regex.h
+++ b/nxt/nxt_regex.h
@@ -35,7 +35,7 @@ NXT_EXPORT nxt_regex_match_data_t *nxt_regex_match_data(nxt_regex_t *regex,
     nxt_regex_context_t *ctx);
 NXT_EXPORT void nxt_regex_match_data_free(nxt_regex_match_data_t *match_data,
     nxt_regex_context_t *ctx);
-NXT_EXPORT nxt_int_t nxt_regex_match(nxt_regex_t *regex, u_char *subject,
+NXT_EXPORT nxt_int_t nxt_regex_match(nxt_regex_t *regex, const u_char *subject,
     size_t len, nxt_regex_match_data_t *match_data, nxt_regex_context_t *ctx);
 NXT_EXPORT int *nxt_regex_captures(nxt_regex_match_data_t *match_data);