Refactor: various: Use const char *const * where possible

In the remaining places I could find where it hasn't already been done.

This is annoying to look at, but it's correct. char ** and gchar ** are
obviously not const, and we should use const where we can. The
frustrating thing is that this pointer type is not compatible with
char **, so it requires explicit casts.

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

daemons/execd/pacemaker-execd.c

@@ -375,7 +375,9 @@ main(int argc, char **argv)
 
     // Open additional log files
     if (options.log_files != NULL) {
-        for (gchar **fname = options.log_files; *fname != NULL; fname++) {
+        for (const char *const *fname = (const char *const *) options.log_files;
+             *fname != NULL; fname++) {
+
             rc = pcmk__add_logfile(*fname);
 
             if (rc != pcmk_rc_ok) {

daemons/fenced/fenced_commands.c

@@ -278,8 +278,8 @@ get_value_for_target(const char *target, const char *values)
 
     mappings = g_strsplit_set(values, "; \t", 0);
 
-    for (gchar **mapping = mappings; (*mapping != NULL) && (value == NULL);
-         mapping++) {
+    for (const char *const *mapping = (const char *const *) mappings;
+         (*mapping != NULL) && (value == NULL); mapping++) {
 
         value = get_value_if_matching(target, *mapping);
     }
@@ -962,7 +962,9 @@ build_port_aliases(const char *hostmap, GList **targets)
     stripped = g_strstrip(g_strdup(hostmap));
     mappings = g_strsplit_set(stripped, "; \t", 0);
 
-    for (gchar **mapping = mappings; *mapping != NULL; mapping++) {
+    for (const char *const *mapping = (const char *const *) mappings;
+         *mapping != NULL; mapping++) {
+
         gchar **nvpair = NULL;
 
         if (pcmk__str_empty(*mapping)) {
@@ -1882,7 +1884,9 @@ fenced_register_level(xmlNode *msg, pcmk__action_result_t *result)
          */
         gchar **devices = g_strsplit(value, ",", 0);
 
-        for (char **dev = devices; (dev != NULL) && (*dev != NULL); dev++) {
+        for (const char *const *dev = (const char *const *) devices;
+             (dev != NULL) && (*dev != NULL); dev++) {
+
             pcmk__trace("Adding device '%s' for %s[%d]", *dev, tp->target, id);
             tp->levels[id] = g_list_append(tp->levels[id],
                                            pcmk__str_copy(*dev));

daemons/pacemakerd/pacemakerd.c

@@ -75,7 +75,9 @@ pacemakerd_features_xml(pcmk__output_t *out, va_list args) {
                                    NULL);
     out->begin_list(out, NULL, NULL, PCMK_XE_FEATURES);
 
-    for (char **s = feature_list; *s != NULL; s++) {
+    for (const char *const *s = (const char *const *) feature_list; *s != NULL;
+         s++) {
+
         pcmk__output_create_xml_text_node(out, PCMK_XE_FEATURE, *s);
     }
 

lib/common/logging.c

@@ -719,7 +719,9 @@ init_tracing(void)
     if (tags != NULL) {
         gchar **trace_tags = g_strsplit(tags, ",", 0);
 
-        for (gchar **tag = trace_tags; *tag != NULL; tag++) {
+        for (const char *const *tag = (const char *const *) trace_tags;
+             *tag != NULL; tag++) {
+
             if (pcmk__str_empty(*tag)) {
                 continue;
             }
@@ -1219,7 +1221,9 @@ crm_log_output_fn(const char *file, const char *function, int line, int level, c
 
     out_lines = g_strsplit(output, "\n", 0);
 
-    for (gchar **out_line = out_lines; *out_line != NULL; out_line++) {
+    for (const char *const *out_line = (const char *const*) out_lines;
+         *out_line != NULL; out_line++) {
+
         do_crm_log_alias(level, file, function, line, "%s [ %s ]",
                          prefix, *out_line);
     }

lib/common/options_display.c

@@ -39,7 +39,9 @@ add_possible_values_default(pcmk__output_t *out,
 
         gchar **values = g_strsplit(option->values, ", ", 0);
 
-        for (gchar **value = values; *value != NULL; value++) {
+        for (const char *const *value = (const char *const *) values;
+             *value != NULL; value++) {
+
             if (buf->len > 0) {
                 g_string_append(buf, ", ");
             }
@@ -295,7 +297,9 @@ add_possible_values_xml(pcmk__output_t *out,
 
     values = g_strsplit(option->values, ", ", 0);
 
-    for (gchar **value = values; *value != NULL; value++) {
+    for (const char *const *value = (const char *const *) values;
+         *value != NULL; value++) {
+
         pcmk__output_create_xml_node(out, PCMK_XE_OPTION,
                                      PCMK_XA_VALUE, *value,
                                      NULL);

lib/common/utils.c

@@ -241,7 +241,8 @@ pcmk__compare_versions(const char *version1, const char *version2)
     segments1 = g_strsplit(pcmk__s(match1, ""), ".", 0);
     segments2 = g_strsplit(pcmk__s(match2, ""), ".", 0);
 
-    for (gchar **segment1 = segments1, **segment2 = segments2;
+    for (const char *const *segment1 = (const char *const *) segments1,
+                    *const *segment2 = (const char *const *) segments2;
          (*segment1 != NULL) || (*segment2 != NULL); ) {
 
         long long value1 = 0;

lib/services/services.c

@@ -1454,7 +1454,9 @@ get_directory_list(const char *root, gboolean files, gboolean executable)
 
     dir_paths = g_strsplit(root, ":", 0);
 
-    for (gchar **dir = dir_paths; *dir != NULL; dir++) {
+    for (const char *const *dir = (const char *const *) dir_paths;
+         *dir != NULL; dir++) {
+
         list = g_list_concat(list, gdl_helper(*dir, files, executable));
     }
 

lib/services/services_ocf.c

@@ -43,7 +43,9 @@ services__list_ocf_providers(void)
     // NULL dirs should be impossible if PCMK__OCF_RA_PATH is defined correctly
     CRM_CHECK(dirs != NULL, return NULL);
 
-    for (gchar **dir = dirs; *dir != NULL; dir++) {
+    for (const char *const *dir = (const char *const *) dirs; *dir != NULL;
+         dir++) {
+
         list = g_list_concat(list, services__list_dir(*dir, false));
     }
 
@@ -94,7 +96,9 @@ services__list_ocf_agents(const char *provider)
     // NULL dirs should be impossible if PCMK__OCF_RA_PATH is defined correctly
     CRM_CHECK(dirs != NULL, return NULL);
 
-    for (gchar **dir = dirs; *dir != NULL; dir++) {
+    for (const char *const *dir = (const char *const *) dirs; *dir != NULL;
+         dir++) {
+
         char *buf = pcmk__assert_asprintf("%s/%s", *dir, provider);
 
         list = g_list_concat(list, services__list_dir(buf, true));
@@ -140,7 +144,9 @@ services__ocf_agent_exists(const char *provider, const char *agent, char **path)
     // NULL dirs should be impossible if PCMK__OCF_RA_PATH is defined correctly
     CRM_CHECK(dirs != NULL, return NULL);
 
-    for (gchar **dir = dirs; !found && (*dir != NULL); dir++) {
+    for (const char *const *dir = (const char *const *) dirs;
+         !found && (*dir != NULL); dir++) {
+
         char *buf = pcmk__assert_asprintf("%s/%s/%s", *dir, provider, agent);
         struct stat sb;
 

tools/cibsecret.c

@@ -321,7 +321,7 @@ reachable_hosts(pcmk__output_t *out, GList *all)
 
     g_free(path);
     g_ptr_array_add(reachable, NULL);
-    return (char **) g_ptr_array_free(reachable, FALSE);
+    return (gchar **) g_ptr_array_free(reachable, FALSE);
 }
 
 struct node_data {

tools/crm_mon.c

@@ -304,11 +304,12 @@ find_section_bit(const char *name) {
 
 static gboolean
 apply_exclude(const gchar *excludes, GError **error) {
-    char **parts = NULL;
+    gchar **parts = NULL;
     gboolean result = TRUE;
 
     parts = g_strsplit(excludes, ",", 0);
-    for (char **s = parts; *s != NULL; s++) {
+
+    for (const char *const *s = (const char *const *) parts; *s != NULL; s++) {
         uint32_t bit = find_section_bit(*s);
 
         if (pcmk__str_eq(*s, "all", pcmk__str_none)) {
@@ -334,11 +335,12 @@ apply_exclude(const gchar *excludes, GError **error) {
 
 static gboolean
 apply_include(const gchar *includes, GError **error) {
-    char **parts = NULL;
+    gchar **parts = NULL;
     gboolean result = TRUE;
 
     parts = g_strsplit(includes, ",", 0);
-    for (char **s = parts; *s != NULL; s++) {
+
+    for (const char *const *s = (const char *const *) parts; *s != NULL; s++) {
         uint32_t bit = find_section_bit(*s);
 
         if (pcmk__str_eq(*s, "all", pcmk__str_none)) {