Merge pull request #4043 from clumens/update_null

Refactor: Don't use pcmk__str_update to set a string to NULL.

Author: nrwahl2

daemons/attrd/attrd_cib.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2025 the Pacemaker project contributors
+ * Copyright 2013-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -292,7 +292,7 @@ attrd_cib_callback(xmlNode *msg, int call_id, int rc, xmlNode *output, void *use
         if (rc == pcmk_ok) {
             pcmk__info("* Wrote %s[%s]=%s", a->id, peer,
                        pcmk__s(v->requested, "(unset)"));
-            pcmk__str_update(&(v->requested), NULL);
+            g_clear_pointer(&v->requested, free);
         } else {
             do_crm_log(level, "* Could not write %s[%s]=%s",
                        a->id, peer, pcmk__s(v->requested, "(unset)"));

daemons/execd/cts-exec-helper.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2025 the Pacemaker project contributors
+ * Copyright 2012-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -81,8 +81,8 @@ param_key_val_cb(const gchar *option_name, const gchar *optarg, gpointer data, G
 
     if (key != NULL && val != NULL) {
         options.params = lrmd_key_value_add(options.params, key, val);
-        pcmk__str_update(&key, NULL);
-        pcmk__str_update(&val, NULL);
+        g_clear_pointer(&key, free);
+        g_clear_pointer(&val, free);
     }
 
     return TRUE;

tools/crm_attribute.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2025 the Pacemaker project contributors
+ * Copyright 2004-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -90,7 +90,7 @@ list_cb(const gchar *option_name, const gchar *optarg, gpointer data,
 static gboolean
 delete_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **error) {
     options.command = attr_cmd_delete;
-    pcmk__str_update(&options.attr_value, NULL);
+    g_clear_pointer(&options.attr_value, free);
     return TRUE;
 }
 
@@ -149,7 +149,7 @@ utilization_cb(const gchar *option_name, const gchar *optarg, gpointer data, GEr
 static gboolean
 value_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **error) {
     options.command = attr_cmd_query;
-    pcmk__str_update(&options.attr_value, NULL);
+    g_clear_pointer(&options.attr_value, free);
     return TRUE;
 }
 

tools/crm_ticket.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2025 the Pacemaker project contributors
+ * Copyright 2012-2026 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -78,8 +78,8 @@ attr_value_cb(const gchar *option_name, const gchar *optarg, gpointer data, GErr
     }
 
     pcmk__insert_dup(attr_set, options.attr_name, options.attr_value);
-    pcmk__str_update(&options.attr_name, NULL);
-    pcmk__str_update(&options.attr_value, NULL);
+    g_clear_pointer(&options.attr_name, free);
+    g_clear_pointer(&options.attr_value, free);
 
     modified = true;
 
@@ -147,8 +147,8 @@ set_attr_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError
     }
 
     pcmk__insert_dup(attr_set, options.attr_name, options.attr_value);
-    pcmk__str_update(&options.attr_name, NULL);
-    pcmk__str_update(&options.attr_value, NULL);
+    g_clear_pointer(&options.attr_name, free);
+    g_clear_pointer(&options.attr_value, free);
 
     modified = true;