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>

10 files changed, 79 insertions, 74 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;
diff --git a/src/nxt_controller.c b/src/nxt_controller.c
index eb814321..230a4d5d 100644
--- a/src/nxt_controller.c
+++ b/src/nxt_controller.c
@@ -1912,8 +1912,8 @@ nxt_controller_cert_in_use(nxt_str_t *name)
     nxt_str_t         str;
     nxt_conf_value_t  *listeners, *listener, *value;
 
-    static nxt_str_t  listeners_path = nxt_string("/listeners");
-    static nxt_str_t  certificate_path = nxt_string("/tls/certificate");
+    static const nxt_str_t  listeners_path = nxt_string("/listeners");
+    static const nxt_str_t  certificate_path = nxt_string("/tls/certificate");
 
     listeners = nxt_conf_get_path(nxt_controller_conf.root, &listeners_path);
 
@@ -2178,7 +2178,7 @@ nxt_controller_script_in_use(nxt_str_t *name)
     nxt_str_t         str;
     nxt_conf_value_t  *js_module, *element;
 
-    static nxt_str_t  js_module_path = nxt_string("/settings/js_module");
+    static const nxt_str_t  js_module_path = nxt_string("/settings/js_module");
 
     js_module = nxt_conf_get_path(nxt_controller_conf.root,
                                     &js_module_path);
@@ -2486,13 +2486,13 @@ nxt_controller_response(nxt_task_t *task, nxt_controller_request_t *req,
     nxt_conf_value_t        *value, *location;
     nxt_conf_json_pretty_t  pretty;
 
-    static nxt_str_t  success_str = nxt_string("success");
-    static nxt_str_t  error_str = nxt_string("error");
-    static nxt_str_t  detail_str = nxt_string("detail");
-    static nxt_str_t  location_str = nxt_string("location");
-    static nxt_str_t  offset_str = nxt_string("offset");
-    static nxt_str_t  line_str = nxt_string("line");
-    static nxt_str_t  column_str = nxt_string("column");
+    static const nxt_str_t  success_str = nxt_string("success");
+    static const nxt_str_t  error_str = nxt_string("error");
+    static const nxt_str_t  detail_str = nxt_string("detail");
+    static const nxt_str_t  location_str = nxt_string("location");
+    static const nxt_str_t  offset_str = nxt_string("offset");
+    static const nxt_str_t  line_str = nxt_string("line");
+    static const nxt_str_t  column_str = nxt_string("column");
 
     static nxt_time_string_t  date_cache = {
         (nxt_atomic_uint_t) -1,
diff --git a/src/nxt_http_route.c b/src/nxt_http_route.c
index d16d5803..98ff5404 100644
--- a/src/nxt_http_route.c
+++ b/src/nxt_http_route.c
@@ -405,8 +405,8 @@ nxt_http_route_match_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
     nxt_http_route_addr_rule_t   *addr_rule;
     nxt_http_route_match_conf_t  mtcf;
 
-    static nxt_str_t  match_path = nxt_string("/match");
-    static nxt_str_t  action_path = nxt_string("/action");
+    static const nxt_str_t  match_path = nxt_string("/match");
+    static const nxt_str_t  action_path = nxt_string("/action");
 
     match_conf = nxt_conf_get_path(cv, &match_path);
 
diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c
index ed5e0d76..a2913872 100644
--- a/src/nxt_isolation.c
+++ b/src/nxt_isolation.c
@@ -224,8 +224,8 @@ nxt_isolation_set_cgroup(nxt_task_t *task, nxt_conf_value_t *isolation,
     nxt_str_t         str;
     nxt_conf_value_t  *obj;
 
-    static nxt_str_t  cgname = nxt_string("cgroup");
-    static nxt_str_t  path = nxt_string("path");
+    static const nxt_str_t  cgname = nxt_string("cgroup");
+    static const nxt_str_t  path = nxt_string("path");
 
     obj = nxt_conf_get_object_member(isolation, &cgname, NULL);
     if (obj == NULL) {
@@ -260,7 +260,7 @@ nxt_isolation_set_namespaces(nxt_task_t *task, nxt_conf_value_t *isolation,
     nxt_int_t         ret;
     nxt_conf_value_t  *obj;
 
-    static nxt_str_t  nsname = nxt_string("namespaces");
+    static const nxt_str_t  nsname = nxt_string("namespaces");
 
     obj = nxt_conf_get_object_member(isolation, &nsname, NULL);
     if (obj != NULL) {
@@ -286,8 +286,8 @@ nxt_isolation_set_creds(nxt_task_t *task, nxt_conf_value_t *isolation,
     nxt_clone_t       *clone;
     nxt_conf_value_t  *array;
 
-    static nxt_str_t uidname = nxt_string("uidmap");
-    static nxt_str_t gidname = nxt_string("gidmap");
+    static const nxt_str_t uidname = nxt_string("uidmap");
+    static const nxt_str_t gidname = nxt_string("gidmap");
 
     clone = &process->isolation.clone;
 
@@ -323,7 +323,7 @@ nxt_isolation_credential_map(nxt_task_t *task, nxt_mp_t *mp,
     nxt_uint_t        i;
     nxt_conf_value_t  *obj;
 
-    static nxt_conf_map_t  nxt_clone_map_entry_conf[] = {
+    static const nxt_conf_map_t  nxt_clone_map_entry_conf[] = {
         {
             nxt_string("container"),
             NXT_CONF_MAP_INT64,
@@ -496,7 +496,7 @@ nxt_isolation_set_rootfs(nxt_task_t *task, nxt_conf_value_t *isolation,
     nxt_str_t         str;
     nxt_conf_value_t  *obj;
 
-    static nxt_str_t  rootfs_name = nxt_string("rootfs");
+    static const nxt_str_t  rootfs_name = nxt_string("rootfs");
 
     obj = nxt_conf_get_object_member(isolation, &rootfs_name, NULL);
     if (obj != NULL) {
@@ -536,10 +536,10 @@ nxt_isolation_set_automount(nxt_task_t *task, nxt_conf_value_t *isolation,
     nxt_conf_value_t         *conf, *value;
     nxt_process_automount_t  *automount;
 
-    static nxt_str_t  automount_name = nxt_string("automount");
-    static nxt_str_t  langdeps_name = nxt_string("language_deps");
-    static nxt_str_t  tmp_name = nxt_string("tmpfs");
-    static nxt_str_t  proc_name = nxt_string("procfs");
+    static const nxt_str_t  automount_name = nxt_string("automount");
+    static const nxt_str_t  langdeps_name = nxt_string("language_deps");
+    static const nxt_str_t  tmp_name = nxt_string("tmpfs");
+    static const nxt_str_t  proc_name = nxt_string("procfs");
 
     automount = &process->isolation.automount;
 
@@ -1110,7 +1110,7 @@ nxt_isolation_set_new_privs(nxt_task_t *task, nxt_conf_value_t *isolation,
 {
     nxt_conf_value_t  *obj;
 
-    static nxt_str_t  new_privs_name = nxt_string("new_privs");
+    static const nxt_str_t  new_privs_name = nxt_string("new_privs");
 
     obj = nxt_conf_get_object_member(isolation, &new_privs_name, NULL);
     if (obj != NULL) {
diff --git a/src/nxt_js.c b/src/nxt_js.c
index 1f9a3ceb..d46231bd 100644
--- a/src/nxt_js.c
+++ b/src/nxt_js.c
@@ -124,9 +124,9 @@ nxt_js_vm_create(nxt_js_conf_t *jcf)
     njs_vm_opt_t     opts;
     nxt_js_module_t  *module, *mod;
 
-    static nxt_str_t  import_str = nxt_string("import");
-    static nxt_str_t  from_str = nxt_string("from");
-    static nxt_str_t  global_str = nxt_string("globalThis");
+    static const nxt_str_t  import_str = nxt_string("import");
+    static const nxt_str_t  from_str = nxt_string("from");
+    static const nxt_str_t  global_str = nxt_string("globalThis");
 
     njs_vm_opt_init(&opts);
 
@@ -237,14 +237,15 @@ nxt_js_add_tpl(nxt_js_conf_t *jcf, nxt_str_t *str, nxt_bool_t strz)
     nxt_js_t   *js;
     nxt_str_t  *func;
 
-    static nxt_str_t  func_str = nxt_string("function(uri, host, remoteAddr, "
-                                            "args, headers, cookies, vars) {"
-                                            "    return ");
+    static const nxt_str_t  func_str =
+                                nxt_string("function(uri, host, remoteAddr, "
+                                           "args, headers, cookies, vars) {"
+                                           "    return ");
 
     /*
      * Appending a terminating null character if strz is true.
      */
-    static nxt_str_t  strz_str = nxt_string(" + '\\x00'");
+    static const nxt_str_t  strz_str = nxt_string(" + '\\x00'");
 
     size = func_str.length + str->length + 1;
 
diff --git a/src/nxt_router.c b/src/nxt_router.c
index e395929e..48870d20 100644
--- a/src/nxt_router.c
+++ b/src/nxt_router.c
@@ -1634,25 +1634,29 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
     nxt_router_app_conf_t       apcf;
     nxt_router_listener_conf_t  lscf;
 
-    static nxt_str_t  http_path = nxt_string("/settings/http");
-    static nxt_str_t  applications_path = nxt_string("/applications");
-    static nxt_str_t  listeners_path = nxt_string("/listeners");
-    static nxt_str_t  routes_path = nxt_string("/routes");
-    static nxt_str_t  access_log_path = nxt_string("/access_log");
+    static const nxt_str_t  http_path = nxt_string("/settings/http");
+    static const nxt_str_t  applications_path = nxt_string("/applications");
+    static const nxt_str_t  listeners_path = nxt_string("/listeners");
+    static const nxt_str_t  routes_path = nxt_string("/routes");
+    static const nxt_str_t  access_log_path = nxt_string("/access_log");
 #if (NXT_TLS)
-    static nxt_str_t  certificate_path = nxt_string("/tls/certificate");
-    static nxt_str_t  conf_commands_path = nxt_string("/tls/conf_commands");
-    static nxt_str_t  conf_cache_path = nxt_string("/tls/session/cache_size");
-    static nxt_str_t  conf_timeout_path = nxt_string("/tls/session/timeout");
-    static nxt_str_t  conf_tickets = nxt_string("/tls/session/tickets");
+    static const nxt_str_t  certificate_path = nxt_string("/tls/certificate");
+    static const nxt_str_t  conf_commands_path =
+                                nxt_string("/tls/conf_commands");
+    static const nxt_str_t  conf_cache_path =
+                                nxt_string("/tls/session/cache_size");
+    static const nxt_str_t  conf_timeout_path =
+                                nxt_string("/tls/session/timeout");
+    static const nxt_str_t  conf_tickets = nxt_string("/tls/session/tickets");
 #endif
 #if (NXT_HAVE_NJS)
-    static nxt_str_t  js_module_path = nxt_string("/settings/js_module");
+    static const nxt_str_t  js_module_path = nxt_string("/settings/js_module");
 #endif
-    static nxt_str_t  static_path = nxt_string("/settings/http/static");
-    static nxt_str_t  websocket_path = nxt_string("/settings/http/websocket");
-    static nxt_str_t  forwarded_path = nxt_string("/forwarded");
-    static nxt_str_t  client_ip_path = nxt_string("/client_ip");
+    static const nxt_str_t  static_path = nxt_string("/settings/http/static");
+    static const nxt_str_t  websocket_path =
+                                nxt_string("/settings/http/websocket");
+    static const nxt_str_t  forwarded_path = nxt_string("/forwarded");
+    static const nxt_str_t  client_ip_path = nxt_string("/client_ip");
 
     root = nxt_conf_json_parse(tmcf->mem_pool, start, end, NULL);
     if (root == NULL) {
@@ -2283,7 +2287,7 @@ nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf,
     nxt_uint_t        exts;
     nxt_conf_value_t  *mtypes_conf, *ext_conf, *value;
 
-    static nxt_str_t  mtypes_path = nxt_string("/mime_types");
+    static const nxt_str_t  mtypes_path = nxt_string("/mime_types");
 
     mp = rtcf->mem_pool;
 
@@ -2360,11 +2364,11 @@ nxt_router_conf_forward(nxt_task_t *task, nxt_mp_t *mp, nxt_conf_value_t *conf)
     nxt_http_forward_t          *forward;
     nxt_http_route_addr_rule_t  *source;
 
-    static nxt_str_t  header_path = nxt_string("/header");
-    static nxt_str_t  client_ip_path = nxt_string("/client_ip");
-    static nxt_str_t  protocol_path = nxt_string("/protocol");
-    static nxt_str_t  source_path = nxt_string("/source");
-    static nxt_str_t  recursive_path = nxt_string("/recursive");
+    static const nxt_str_t  header_path = nxt_string("/header");
+    static const nxt_str_t  client_ip_path = nxt_string("/client_ip");
+    static const nxt_str_t  protocol_path = nxt_string("/protocol");
+    static const nxt_str_t  source_path = nxt_string("/source");
+    static const nxt_str_t  recursive_path = nxt_string("/recursive");
 
     header_conf = nxt_conf_get_path(conf, &header_path);
 
diff --git a/src/nxt_router_access_log.c b/src/nxt_router_access_log.c
index 7fc59972..ff17b0b6 100644
--- a/src/nxt_router_access_log.c
+++ b/src/nxt_router_access_log.c
@@ -75,7 +75,7 @@ nxt_router_access_log_create(nxt_task_t *task, nxt_router_conf_t *rtcf,
     nxt_router_access_log_t       *access_log;
     nxt_router_access_log_conf_t  alcf;
 
-    static nxt_str_t  log_format_str = nxt_string("$remote_addr - - "
+    static const nxt_str_t  log_format_str = nxt_string("$remote_addr - - "
         "[$time_local] \"$request_line\" $status $body_bytes_sent "
         "\"$header_referer\" \"$header_user_agent\"");
 
diff --git a/src/nxt_unit.c b/src/nxt_unit.c
index 576c751d..50e156d8 100644
--- a/src/nxt_unit.c
+++ b/src/nxt_unit.c
@@ -1948,9 +1948,9 @@ nxt_unit_request_group_dup_fields(nxt_unit_request_info_t *req)
     nxt_unit_field_t    *fields, f;
     nxt_unit_request_t  *r;
 
-    static nxt_str_t  content_length = nxt_string("content-length");
-    static nxt_str_t  content_type = nxt_string("content-type");
-    static nxt_str_t  cookie = nxt_string("cookie");
+    static const nxt_str_t  content_length = nxt_string("content-length");
+    static const nxt_str_t  content_type = nxt_string("content-type");
+    static const nxt_str_t  cookie = nxt_string("cookie");
 
     nxt_unit_req_debug(req, "group_dup_fields");
 
diff --git a/src/nxt_upstream.c b/src/nxt_upstream.c
index 17593173..c92d4a50 100644
--- a/src/nxt_upstream.c
+++ b/src/nxt_upstream.c
@@ -25,7 +25,7 @@ nxt_upstreams_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
     nxt_upstreams_t   *upstreams;
     nxt_conf_value_t  *upstreams_conf, *upcf;
 
-    static nxt_str_t  upstreams_name = nxt_string("upstreams");
+    static const nxt_str_t  upstreams_name = nxt_string("upstreams");
 
     upstreams_conf = nxt_conf_get_object_member(conf, &upstreams_name, NULL);
 
diff --git a/src/nxt_upstream_round_robin.c b/src/nxt_upstream_round_robin.c
index 31e2f48a..1274f5a9 100644
--- a/src/nxt_upstream_round_robin.c
+++ b/src/nxt_upstream_round_robin.c
@@ -52,8 +52,8 @@ nxt_upstream_round_robin_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
     nxt_conf_value_t            *servers_conf, *srvcf, *wtcf;
     nxt_upstream_round_robin_t  *urr;
 
-    static nxt_str_t  servers = nxt_string("servers");
-    static nxt_str_t  weight = nxt_string("weight");
+    static const nxt_str_t  servers = nxt_string("servers");
+    static const nxt_str_t  weight = nxt_string("weight");
 
     mp = tmcf->router_conf->mem_pool;