Refactor: libcib: New cib__set_calldata()

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

Author: nrwahl2

daemons/based/based_callbacks.c

@@ -69,13 +69,7 @@ create_cib_reply(const char *op, const char *call_id, const char *client_id,
     pcmk__xe_set(reply, PCMK__XA_CIB_CLIENTID, client_id);
     pcmk__xe_set_int(reply, PCMK__XA_CIB_CALLOPT, call_options);
     pcmk__xe_set_int(reply, PCMK__XA_CIB_RC, rc);
-
-    if (call_data != NULL) {
-        xmlNode *wrapper = pcmk__xe_create(reply, PCMK__XE_CIB_CALLDATA);
-
-        pcmk__trace("Attaching reply output");
-        pcmk__xml_copy(wrapper, call_data);
-    }
+    cib__set_calldata(reply, call_data);
 
     crm_log_xml_explicit(reply, "cib:reply");
     return reply;

daemons/based/based_messages.c

@@ -110,21 +110,18 @@ based_process_ping(xmlNode *req, xmlNode *input, xmlNode **cib,
     const char *seq = pcmk__xe_get(req, PCMK__XA_CIB_PING_ID);
     char *digest = pcmk__digest_xml(the_cib, true);
 
-    xmlNode *wrapper = NULL;
-
     *answer = pcmk__xe_create(NULL, PCMK__XE_PING_RESPONSE);
 
     pcmk__xe_set(*answer, PCMK_XA_CRM_FEATURE_SET, CRM_FEATURE_SET);
     pcmk__xe_set(*answer, PCMK_XA_DIGEST, digest);
     pcmk__xe_set(*answer, PCMK__XA_CIB_PING_ID, seq);
 
-    wrapper = pcmk__xe_create(*answer, PCMK__XE_CIB_CALLDATA);
-
     if (the_cib != NULL) {
-        xmlNode *shallow = pcmk__xe_create(wrapper,
-                                           (const char *) the_cib->name);
+        xmlNode *shallow = pcmk__xe_create(NULL, (const char *) the_cib->name);
 
         pcmk__xe_copy_attrs(shallow, the_cib, pcmk__xaf_none);
+        cib__set_calldata(*answer, shallow);
+        pcmk__xml_free(shallow);
     }
 
     pcmk__info("Reporting our current digest to %s: %s for %s.%s.%s",
@@ -374,7 +371,6 @@ sync_our_cib(xmlNode *request, bool all)
     const char *op = pcmk__xe_get(request, PCMK__XA_CIB_OP);
     pcmk__node_status_t *peer = NULL;
     xmlNode *replace_request = NULL;
-    xmlNode *wrapper = NULL;
 
     CRM_CHECK(the_cib != NULL, return EINVAL);
     CRM_CHECK(all || (host != NULL), return EINVAL);
@@ -401,8 +397,7 @@ sync_our_cib(xmlNode *request, bool all)
     digest = pcmk__digest_xml(the_cib, true);
     pcmk__xe_set(replace_request, PCMK_XA_DIGEST, digest);
 
-    wrapper = pcmk__xe_create(replace_request, PCMK__XE_CIB_CALLDATA);
-    pcmk__xml_copy(wrapper, the_cib);
+    cib__set_calldata(replace_request, the_cib);
 
     if (!all) {
         peer = pcmk__get_node(0, host, NULL, pcmk__node_search_cluster_member);

include/crm/cib/internal.h

@@ -191,6 +191,7 @@ cib__client_triggers_refresh(const char *name)
 
 int cib__get_notify_patchset(const xmlNode *msg, const xmlNode **patchset);
 xmlNode *cib__get_calldata(const xmlNode *request);
+void cib__set_calldata(xmlNode *request, xmlNode *data);
 
 int cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
                        xmlNode **output);

lib/cib/cib_utils.c

@@ -177,7 +177,8 @@ cib_acl_enabled(xmlNode *xml, const char *user)
  *
  * \param[in] request  CIB request XML
  *
- * \return Call data, or \c NULL if none is found
+ * \return Call data added by \c cib__set_calldata(), or \c NULL if none is
+ *         found
  */
 xmlNode *
 cib__get_calldata(const xmlNode *request)
@@ -188,6 +189,28 @@ cib__get_calldata(const xmlNode *request)
     return pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
 }
 
+/*!
+ * \internal
+ * \brief Add call data to a CIB request
+ *
+ * Add a copy of \p data to a new \c PCMK__XE_CIB_CALLDATA child of \p request.
+ *
+ * \param[in,out] request  CIB request XML
+ * \param[in]     data     Call data to add a copy of (if \c NULL, do nothing)
+ */
+void
+cib__set_calldata(xmlNode *request, xmlNode *data)
+{
+    xmlNode *wrapper = NULL;
+
+    if (data == NULL) {
+        return;
+    }
+
+    wrapper = pcmk__xe_create(request, PCMK__XE_CIB_CALLDATA);
+    pcmk__xml_copy(wrapper, data);
+}
+
 int
 cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
                    xmlNode **output)
@@ -647,12 +670,7 @@ cib__create_op(cib_t *cib, const char *op, const char *host,
     pcmk__trace("Sending call options: %.8lx, %d", (long) call_options,
                 call_options);
     pcmk__xe_set_int(*op_msg, PCMK__XA_CIB_CALLOPT, call_options);
-
-    if (data != NULL) {
-        xmlNode *wrapper = pcmk__xe_create(*op_msg, PCMK__XE_CIB_CALLDATA);
-
-        pcmk__xml_copy(wrapper, data);
-    }
+    cib__set_calldata(*op_msg, data);
 
     return pcmk_rc_ok;
 }