Refactor: libcib: Drop cib_diff_version_details()

It's a simple wrapper around pcmk__xml_patchset_versions but requires
seven arguments.

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

Author: nrwahl2

daemons/based/based_messages.c

@@ -309,23 +309,17 @@ cib_server_process_diff(const char *op, int options, const char *section, xmlNod
 
     // The primary instance should never ignore a diff
     if (sync_in_progress && !based_is_primary) {
-        int diff_add_updates = 0;
-        int diff_add_epoch = 0;
-        int diff_add_admin_epoch = 0;
+        int source[] = { 0, 0, 0 };
+        int target[] = { 0, 0, 0 };
 
-        int diff_del_updates = 0;
-        int diff_del_epoch = 0;
-        int diff_del_admin_epoch = 0;
-
-        cib_diff_version_details(input,
-                                 &diff_add_admin_epoch, &diff_add_epoch, &diff_add_updates,
-                                 &diff_del_admin_epoch, &diff_del_epoch, &diff_del_updates);
+        // @TODO Check return code
+        pcmk__xml_patchset_versions(input, source, target);
 
         sync_in_progress++;
         pcmk__notice("Not applying diff %d.%d.%d -> %d.%d.%d (sync in "
                      "progress)",
-                     diff_del_admin_epoch, diff_del_epoch, diff_del_updates,
-                     diff_add_admin_epoch, diff_add_epoch, diff_add_updates);
+                     source[0], source[1], source[2],
+                     target[0], target[1], target[2]);
         return -pcmk_err_diff_resync;
     }
 

daemons/based/based_notify.c

@@ -155,13 +155,8 @@ based_diff_notify(const char *op, int result, const char *call_id,
                   const char *client_id, const char *client_name,
                   const char *origin, xmlNode *update, xmlNode *diff)
 {
-    int add_updates = 0;
-    int add_epoch = 0;
-    int add_admin_epoch = 0;
-
-    int del_updates = 0;
-    int del_epoch = 0;
-    int del_admin_epoch = 0;
+    int source[] = { 0, 0, 0 };
+    int target[] = { 0, 0, 0 };
 
     uint8_t log_level = LOG_TRACE;
 
@@ -176,31 +171,28 @@ based_diff_notify(const char *op, int result, const char *call_id,
         log_level = LOG_WARNING;
     }
 
-    cib_diff_version_details(diff, &add_admin_epoch, &add_epoch, &add_updates,
-                             &del_admin_epoch, &del_epoch, &del_updates);
+    /* @TODO Check return code? How should we handle an error? Are these log
+     * messages even useful?
+     */
+    pcmk__xml_patchset_versions(diff, source, target);
 
-    if ((add_admin_epoch != del_admin_epoch)
-        || (add_epoch != del_epoch)
-        || (add_updates != del_updates)) {
+    if ((source[0] != target[0])
+        || (source[1] != target[1])
+        || (source[2] != target[2])) {
 
         do_crm_log(log_level,
                    "Updated CIB generation %d.%d.%d to %d.%d.%d from client "
                    "%s%s%s (%s) (%s)",
-                   del_admin_epoch, del_epoch, del_updates,
-                   add_admin_epoch, add_epoch, add_updates,
-                   client_name,
+                   source[0], source[1], source[2],
+                   target[0], target[1], target[2], client_name,
                    ((call_id != NULL)? " call " : ""), pcmk__s(call_id, ""),
                    pcmk__s(origin, "unspecified peer"), pcmk_strerror(result));
 
-    } else if ((add_admin_epoch != 0)
-               || (add_epoch != 0)
-               || (add_updates != 0)) {
-
+    } else if ((target[0] != 0) || (target[1] != 0) || (target[2] != 0)) {
         do_crm_log(log_level,
                    "Local-only change to CIB generation %d.%d.%d from client "
                    "%s%s%s (%s) (%s)",
-                   add_admin_epoch, add_epoch, add_updates,
-                   client_name,
+                   target[0], target[1], target[2], client_name,
                    ((call_id != NULL)? " call " : ""), pcmk__s(call_id, ""),
                    pcmk__s(origin, "unspecified peer"), pcmk_strerror(result));
     }

include/crm/cib/internal.h

@@ -98,9 +98,6 @@ enum cib__op_type {
     cib__op_schemas,
 };
 
-gboolean cib_diff_version_details(xmlNode * diff, int *admin_epoch, int *epoch, int *updates,
-                                  int *_admin_epoch, int *_epoch, int *_updates);
-
 gboolean cib_read_config(GHashTable * options, xmlNode * current_cib);
 
 typedef int (*cib__op_fn_t)(const char *, int, const char *, xmlNode *,

lib/cib/cib_utils.c

@@ -41,26 +41,6 @@ cib_version_details(xmlNode * cib, int *admin_epoch, int *epoch, int *updates)
     return TRUE;
 }
 
-gboolean
-cib_diff_version_details(xmlNode * diff, int *admin_epoch, int *epoch, int *updates,
-                         int *_admin_epoch, int *_epoch, int *_updates)
-{
-    int add[] = { 0, 0, 0 };
-    int del[] = { 0, 0, 0 };
-
-    pcmk__xml_patchset_versions(diff, del, add);
-
-    *admin_epoch = add[0];
-    *epoch = add[1];
-    *updates = add[2];
-
-    *_admin_epoch = del[0];
-    *_epoch = del[1];
-    *_updates = del[2];
-
-    return TRUE;
-}
-
 /*!
  * \internal
  * \brief Get the XML patchset from a CIB diff notification