Refactor: tools: Use gchar for override_params in crm_resource.c

Allows us to avoid duplicating strings in main()

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

tools/crm_resource.c

@@ -312,7 +312,7 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data,
         options.rsc_cmd = cmd_digests;
 
         if (options.override_params == NULL) {
-            options.override_params = pcmk__strkey_table(free, free);
+            options.override_params = pcmk__strkey_table(g_free, g_free);
         }
 
     } else if (pcmk__str_any_of(option_name,
@@ -325,7 +325,7 @@ command_cb(const gchar *option_name, const gchar *optarg, gpointer data,
         options.operation = g_strdup(option_name + 2);  // skip "--"
 
         if (options.override_params == NULL) {
-            options.override_params = pcmk__strkey_table(free, free);
+            options.override_params = pcmk__strkey_table(g_free, g_free);
         }
 
         if (optarg != NULL) {
@@ -1851,9 +1851,7 @@ main(int argc, char **argv)
                 goto done;
             }
 
-            pcmk__insert_dup(options.override_params, name, value);
-            g_free(name);
-            g_free(value);
+            g_hash_table_insert(options.override_params, name, value);
         }
     }
 

tools/crm_resource_print.c

@@ -362,6 +362,7 @@ override_xml(pcmk__output_t *out, va_list args) {
     return pcmk_rc_ok;
 }
 
+// Does not modify overrides or its contents
 PCMK__OUTPUT_ARGS("resource-agent-action", "int", "const char *", "const char *",
                   "const char *", "const char *", "const char *", "GHashTable *",
                   "crm_exit_t", "int", "const char *", "const char *", "const char *")
@@ -422,6 +423,7 @@ resource_agent_action_default(pcmk__output_t *out, va_list args) {
     return pcmk_rc_ok;
 }
 
+// Does not modify overrides or its contents
 PCMK__OUTPUT_ARGS("resource-agent-action", "int", "const char *", "const char *",
                   "const char *", "const char *", "const char *", "GHashTable *",
                   "crm_exit_t", "int", "const char *", "const char *", "const char *")

tools/crm_resource_runtime.c

@@ -2238,6 +2238,7 @@ apply_overrides(GHashTable *params, GHashTable *overrides)
     }
 }
 
+// Does not modify override_hash or its contents
 crm_exit_t
 cli_resource_execute_from_params(pcmk__output_t *out, const char *rsc_name,
                                  const char *rsc_class, const char *rsc_prov,
@@ -2330,6 +2331,7 @@ get_action_timeout(pcmk_resource_t *rsc, const char *action)
     return (guint) QB_MIN(timeout_ms, UINT_MAX);
 }
 
+// Does not modify override_hash or its contents
 crm_exit_t
 cli_resource_execute(pcmk_resource_t *rsc, const char *requested_name,
                      const char *rsc_action, GHashTable *override_hash,