Refactor: libcrmcommon: Make vfields file-scope in patchset.c

Reduce some duplication

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

Author: nrwahl2

lib/common/patchset.c

@@ -26,6 +26,12 @@
 #include <crm/common/xml_internal.h>  // CRM_XML_LOG_BASE, etc.
 #include "crmcommon_private.h"
 
+static const char *const vfields[] = {
+    PCMK_XA_ADMIN_EPOCH,
+    PCMK_XA_EPOCH,
+    PCMK_XA_NUM_UPDATES,
+};
+
 /* Add changes for specified XML to patchset.
  * For patchset format, refer to diff schema.
  */
@@ -185,11 +191,6 @@ xml_create_patchset_v2(xmlNode *source, xmlNode *target)
     xmlNode *v = NULL;
     xmlNode *version = NULL;
     xmlNode *patchset = NULL;
-    const char *vfields[] = {
-        PCMK_XA_ADMIN_EPOCH,
-        PCMK_XA_EPOCH,
-        PCMK_XA_NUM_UPDATES,
-    };
 
     pcmk__assert(target != NULL);
 
@@ -330,12 +331,6 @@ int
 pcmk__xml_patchset_versions(const xmlNode *patchset, int source[3],
                             int target[3])
 {
-    static const char *const vfields[] = {
-        PCMK_XA_ADMIN_EPOCH,
-        PCMK_XA_EPOCH,
-        PCMK_XA_NUM_UPDATES,
-    };
-
     const xmlNode *version = pcmk__xe_first_child(patchset, PCMK_XE_VERSION,
                                                   NULL, NULL);
     const xmlNode *source_xml = pcmk__xe_first_child(version, PCMK_XE_SOURCE,
@@ -389,12 +384,6 @@ xml_patch_version_check(const xmlNode *xml, const xmlNode *patchset)
     int del[] = { 0, 0, 0 };
     int rc = pcmk_rc_ok;
 
-    const char *vfields[] = {
-        PCMK_XA_ADMIN_EPOCH,
-        PCMK_XA_EPOCH,
-        PCMK_XA_NUM_UPDATES,
-    };
-
     for (lpc = 0; lpc < PCMK__NELEM(vfields); lpc++) {
         crm_element_value_int(xml, vfields[lpc], &(this[lpc]));
         crm_trace("Got %d for this[%s]", this[lpc], vfields[lpc]);
@@ -928,12 +917,6 @@ pcmk__cib_element_in_patchset(const xmlNode *patchset, const char *element)
 bool
 xml_patch_versions(const xmlNode *patchset, int add[3], int del[3])
 {
-    static const char *const vfields[] = {
-        PCMK_XA_ADMIN_EPOCH,
-        PCMK_XA_EPOCH,
-        PCMK_XA_NUM_UPDATES,
-    };
-
     const xmlNode *version = pcmk__xe_first_child(patchset, PCMK_XE_VERSION,
                                                   NULL, NULL);
     const xmlNode *source = pcmk__xe_first_child(version, PCMK_XE_SOURCE, NULL,