Refactor: libcib: New cib__get_calldata()

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

Author: nrwahl2

daemons/based/based_callbacks.c

@@ -195,10 +195,7 @@ process_ping_reply(xmlNode *reply)
     uint64_t seq = 0;
     const char *host = pcmk__xe_get(reply, PCMK__XA_SRC);
 
-    xmlNode *wrapper = pcmk__xe_first_child(reply, PCMK__XE_CIB_CALLDATA, NULL,
-                                            NULL);
-    xmlNode *pong = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
-
+    xmlNode *pong = cib__get_calldata(reply);
     const char *seq_s = pcmk__xe_get(pong, PCMK__XA_CIB_PING_ID);
     const char *digest = pcmk__xe_get(pong, PCMK_XA_DIGEST);
 
@@ -240,10 +237,7 @@ process_ping_reply(xmlNode *reply)
         pcmk__trace("Processing ping reply %s from %s (%s)", seq_s, host,
                     digest);
         if (!pcmk__str_eq(ping_digest, digest, pcmk__str_casei)) {
-            xmlNode *wrapper = pcmk__xe_first_child(pong, PCMK__XE_CIB_CALLDATA,
-                                                    NULL, NULL);
-            xmlNode *remote_versions = pcmk__xe_first_child(wrapper, NULL, NULL,
-                                                            NULL);
+            xmlNode *remote_versions = cib__get_calldata(pong);
 
             const char *admin_epoch_s = NULL;
             const char *epoch_s = NULL;

daemons/based/based_messages.c

@@ -156,7 +156,6 @@ int
 based_process_schemas(xmlNode *req, xmlNode *input, xmlNode **cib,
                       xmlNode **answer)
 {
-    xmlNode *wrapper = NULL;
     xmlNode *data = NULL;
 
     const char *after_ver = NULL;
@@ -165,8 +164,7 @@ based_process_schemas(xmlNode *req, xmlNode *input, xmlNode **cib,
 
     *answer = pcmk__xe_create(NULL, PCMK__XA_SCHEMAS);
 
-    wrapper = pcmk__xe_first_child(req, PCMK__XE_CIB_CALLDATA, NULL, NULL);
-    data = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
+    data = cib__get_calldata(req);
     if (data == NULL) {
         pcmk__warn("No data specified in request");
         return EPROTO;

include/crm/cib/internal.h

@@ -190,6 +190,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);
 
 int cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
                        xmlNode **output);

lib/cib/cib_native.c

@@ -103,9 +103,7 @@ cib_native_perform_op_delegate(cib_t *cib, const char *op, const char *host,
     rc = pcmk_ok;
     pcmk__xe_get_int(op_reply, PCMK__XA_CIB_CALLID, &reply_id);
     if (reply_id == cib->call_id) {
-        xmlNode *wrapper = pcmk__xe_first_child(op_reply, PCMK__XE_CIB_CALLDATA,
-                                                NULL, NULL);
-        xmlNode *tmp = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
+        xmlNode *tmp = cib__get_calldata(op_reply);
 
         pcmk__trace("Synchronous reply %d received", reply_id);
         if (pcmk__xe_get_int(op_reply, PCMK__XA_CIB_RC, &rc) != pcmk_rc_ok) {

lib/cib/cib_remote.c

@@ -179,9 +179,7 @@ cib_remote_perform_op(cib_t *cib, const char *op, const char *host,
         /* do nothing more */
 
     } else if (!(call_options & cib_discard_reply)) {
-        xmlNode *wrapper = pcmk__xe_first_child(op_reply, PCMK__XE_CIB_CALLDATA,
-                                                NULL, NULL);
-        xmlNode *tmp = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
+        xmlNode *tmp = cib__get_calldata(op_reply);
 
         if (tmp == NULL) {
             pcmk__trace("No output in reply to \"%s\" command %d", op,

lib/cib/cib_utils.c

@@ -173,12 +173,14 @@ cib_acl_enabled(xmlNode *xml, const char *user)
 
 /*!
  * \internal
- * \brief Get input data from a CIB request
+ * \brief Get call data from a CIB request
  *
  * \param[in] request  CIB request XML
+ *
+ * \return Call data, or \c NULL if none is found
  */
-static xmlNode *
-get_op_input(const xmlNode *request)
+xmlNode *
+cib__get_calldata(const xmlNode *request)
 {
     xmlNode *wrapper = pcmk__xe_first_child(request, PCMK__XE_CIB_CALLDATA,
                                             NULL, NULL);
@@ -209,7 +211,7 @@ cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
     user = pcmk__xe_get(req, PCMK__XA_CIB_USER);
     pcmk__xe_get_flags(req, PCMK__XA_CIB_CALLOPT, &call_options, cib_none);
 
-    input = get_op_input(req);
+    input = cib__get_calldata(req);
     cib = *current_cib;
 
     if (cib_acl_enabled(*current_cib, user)
@@ -497,7 +499,7 @@ cib_perform_op(enum cib_variant variant, cib__op_fn_t fn, xmlNode *req,
     user = pcmk__xe_get(req, PCMK__XA_CIB_USER);
     pcmk__xe_get_flags(req, PCMK__XA_CIB_CALLOPT, &call_options, cib_none);
 
-    input = get_op_input(req);
+    input = cib__get_calldata(req);
     enable_acl = cib_acl_enabled(*cib, user);
 
     pcmk__trace("Processing %s for section '%s', user '%s'", op,
@@ -735,12 +737,9 @@ cib_native_callback(cib_t * cib, xmlNode * msg, int call_id, int rc)
     cib_callback_client_t *blob = NULL;
 
     if (msg != NULL) {
-        xmlNode *wrapper = NULL;
-
         pcmk__xe_get_int(msg, PCMK__XA_CIB_RC, &rc);
         pcmk__xe_get_int(msg, PCMK__XA_CIB_CALLID, &call_id);
-        wrapper = pcmk__xe_first_child(msg, PCMK__XE_CIB_CALLDATA, NULL, NULL);
-        output = pcmk__xe_first_child(wrapper, NULL, NULL, NULL);
+        output = cib__get_calldata(msg);
     }
 
     blob = cib__lookup_id(call_id);