Refactor: tools: Clarify options.cmdline_params in crm_resource.c

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

Author: nrwahl2

lib/services/services.c

@@ -250,6 +250,7 @@ copy_action_arguments(svc_action_t *op, uint32_t ra_caps, const char *name,
     return pcmk_rc_ok;
 }
 
+// Takes ownership of params
 svc_action_t *
 services__create_resource_action(const char *name, const char *standard,
                         const char *provider, const char *agent,

tools/crm_resource.c

@@ -772,6 +772,12 @@ option_cb(const gchar *option_name, const gchar *optarg, gpointer data,
     if (pcmk__scan_nvpair(optarg, &name, &value) != pcmk_rc_ok) {
         return FALSE;
     }
+
+    /* services__create_resource_action() ultimately takes ownership of
+     * options.cmdline_params. It's not worth trying to ensure that the entire
+     * call path uses (gchar *) strings and g_free(). So create the table for
+     * (char *) strings, and duplicate the (gchar *) strings when inserting.
+     */
     if (options.cmdline_params == NULL) {
         options.cmdline_params = pcmk__strkey_table(free, free);
     }
@@ -1902,7 +1908,6 @@ main(int argc, char **argv)
         g_set_error(&error, PCMK__EXITC_ERROR, exit_code,
                     _("--option must be used with --validate and without -r"));
         g_hash_table_destroy(options.cmdline_params);
-        options.cmdline_params = NULL;
         goto done;
     }
 

tools/crm_resource_runtime.c

@@ -2238,7 +2238,9 @@ apply_overrides(GHashTable *params, GHashTable *overrides)
     }
 }
 
-// Does not modify override_hash or its contents
+/* Takes ownership of params.
+ * 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,
@@ -2260,6 +2262,7 @@ cli_resource_execute_from_params(pcmk__output_t *out, const char *rsc_name,
     set_agent_environment(params, timeout_ms, check_level, resource_verbose);
     apply_overrides(params, override_hash);
 
+    // services__create_resource_action() takes ownership of params on success
     op = services__create_resource_action(rsc_name? rsc_name : "test",
                                           rsc_class, rsc_prov, rsc_type, action,
                                           0, QB_MIN(timeout_ms, INT_MAX),