Constify a bunch of static local variables

A common pattern was to declare variables in functions like

  static nxt_str_t ...

Not sure why static, as they were being treated more like string
literals (and of course they are _not_ thread safe), let's actually make
them constants (qualifier wise).

This handles core code conversion.

Reviewed-by: Zhidao HONG <z.hong@f5.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index 38a918fb..4aaa1b9a 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -1445,7 +1445,7 @@ nxt_conf_vldt_type(nxt_conf_validation_t *vldt, const nxt_str_t *name,
     nxt_uint_t  value_type, n, t;
     u_char      buf[nxt_length(NXT_CONF_VLDT_ANY_TYPE_STR)];
 
-    static nxt_str_t  type_name[] = {
+    static const nxt_str_t  type_name[] = {
         nxt_string("a null"),
         nxt_string("a boolean"),
         nxt_string("an integer number"),
@@ -1568,7 +1568,7 @@ nxt_conf_vldt_if(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
 {
     nxt_str_t  str;
 
-    static nxt_str_t  if_str = nxt_string("if");
+    static const nxt_str_t  if_str = nxt_string("if");
 
     if (nxt_conf_type(value) != NXT_CONF_STRING) {
         return nxt_conf_vldt_error(vldt, "The \"if\" must be a string");
@@ -1731,7 +1731,7 @@ nxt_conf_vldt_action(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
     nxt_conf_value_t        *action;
     nxt_conf_vldt_object_t  *members;
 
-    static struct {
+    static const struct {
         nxt_str_t               name;
         nxt_conf_vldt_object_t  *members;
 
@@ -1778,7 +1778,7 @@ nxt_conf_vldt_pass(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
     nxt_int_t  ret;
     nxt_str_t  segments[3];
 
-    static nxt_str_t  targets_str = nxt_string("targets");
+    static const nxt_str_t  targets_str = nxt_string("targets");
 
     nxt_conf_get_string(value, &pass);
 
@@ -1932,7 +1932,7 @@ nxt_conf_vldt_share_element(nxt_conf_validation_t *vldt,
 {
     nxt_str_t  str;
 
-    static nxt_str_t  share = nxt_string("share");
+    static const nxt_str_t  share = nxt_string("share");
 
     if (nxt_conf_type(value) != NXT_CONF_STRING) {
         return nxt_conf_vldt_error(vldt, "The \"share\" array must "
@@ -1982,7 +1982,7 @@ nxt_conf_vldt_python(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
 {
     nxt_conf_value_t  *targets;
 
-    static nxt_str_t  targets_str = nxt_string("targets");
+    static const nxt_str_t  targets_str = nxt_string("targets");
 
     targets = nxt_conf_get_object_member(value, &targets_str, NULL);
 
@@ -2575,7 +2575,7 @@ nxt_conf_vldt_response_header(nxt_conf_validation_t *vldt, nxt_str_t *name,
     nxt_str_t   str;
     nxt_uint_t  type;
 
-    static nxt_str_t  content_length = nxt_string("Content-Length");
+    static const nxt_str_t  content_length = nxt_string("Content-Length");
 
     if (name->length == 0) {
         return nxt_conf_vldt_error(vldt, "The response header name "
@@ -2615,7 +2615,7 @@ nxt_conf_vldt_app_name(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
     nxt_str_t         name;
     nxt_conf_value_t  *apps, *app;
 
-    static nxt_str_t  apps_str = nxt_string("applications");
+    static const nxt_str_t  apps_str = nxt_string("applications");
 
     nxt_conf_get_string(value, &name);
 
@@ -2647,8 +2647,8 @@ nxt_conf_vldt_forwarded(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
 {
     nxt_conf_value_t  *client_ip, *protocol;
 
-    static nxt_str_t  client_ip_str = nxt_string("client_ip");
-    static nxt_str_t  protocol_str = nxt_string("protocol");
+    static const nxt_str_t  client_ip_str = nxt_string("client_ip");
+    static const nxt_str_t  protocol_str = nxt_string("protocol");
 
     client_ip = nxt_conf_get_object_member(value, &client_ip_str, NULL);
     protocol = nxt_conf_get_object_member(value, &protocol_str, NULL);
@@ -2673,9 +2673,9 @@ nxt_conf_vldt_app(nxt_conf_validation_t *vldt, nxt_str_t *name,
     nxt_conf_value_t       *type_value;
     nxt_app_lang_module_t  *lang;
 
-    static nxt_str_t  type_str = nxt_string("type");
+    static const nxt_str_t  type_str = nxt_string("type");
 
-    static struct {
+    static const struct {
         nxt_conf_vldt_handler_t  validator;
         nxt_conf_vldt_object_t   *members;
 
@@ -3188,7 +3188,7 @@ nxt_conf_vldt_php(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
 {
     nxt_conf_value_t  *targets;
 
-    static nxt_str_t  targets_str = nxt_string("targets");
+    static const nxt_str_t  targets_str = nxt_string("targets");
 
     targets = nxt_conf_get_object_member(value, &targets_str, NULL);
 
@@ -3269,7 +3269,7 @@ nxt_conf_vldt_upstream(nxt_conf_validation_t *vldt, nxt_str_t *name,
     nxt_int_t         ret;
     nxt_conf_value_t  *conf;
 
-    static nxt_str_t  servers = nxt_string("servers");
+    static const nxt_str_t  servers = nxt_string("servers");
 
     ret = nxt_conf_vldt_type(vldt, name, value, NXT_CONF_VLDT_OBJECT);
 
@@ -3414,7 +3414,7 @@ nxt_conf_vldt_access_log(nxt_conf_validation_t *vldt, nxt_conf_value_t *value,
     nxt_int_t                        ret;
     nxt_conf_vldt_access_log_conf_t  conf;
 
-    static nxt_str_t  format_str = nxt_string("format");
+    static const nxt_str_t  format_str = nxt_string("format");
 
     if (nxt_conf_type(value) == NXT_CONF_STRING) {
         return NXT_OK;