Use G_N_ELEMENTS instead of ARRAY_CARDINALITY

Prefer the GLib version of the macro.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

19 files changed, 46 insertions, 46 deletions

diff --git a/src/util/virarch.c b/src/util/virarch.c
index 3f5efde8e2..f41e3e86bb 100644
--- a/src/util/virarch.c
+++ b/src/util/virarch.c
@@ -81,7 +81,7 @@ static const struct virArchData {
     { "xtensaeb",     32, VIR_ARCH_BIG_ENDIAN },
 };
 
-verify(ARRAY_CARDINALITY(virArchData) == VIR_ARCH_LAST);
+verify(G_N_ELEMENTS(virArchData) == VIR_ARCH_LAST);
 
 
 /**
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 23bc44734e..b54ae1283e 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -133,7 +133,7 @@ void virAuditSend(virLogSourcePtr source,
             [VIR_AUDIT_RECORD_RESOURCE] = AUDIT_VIRT_RESOURCE,
         };
 
-        if (type >= ARRAY_CARDINALITY(record_types) || record_types[type] == 0)
+        if (type >= G_N_ELEMENTS(record_types) || record_types[type] == 0)
             VIR_WARN("Unknown audit record type %d", type);
         else if (audit_log_user_message(auditfd, record_types[type], str, NULL,
                                         clientaddr, clienttty, success) < 0) {
diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
index 23908d769d..dcf8e3383b 100644
--- a/src/util/vircgroupv1.c
+++ b/src/util/vircgroupv1.c
@@ -555,7 +555,7 @@ virCgroupV1CpuSetInherit(virCgroupPtr parent,
     };
 
     VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path);
-    for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) {
+    for (i = 0; i < G_N_ELEMENTS(inherit_values); i++) {
         VIR_AUTOFREE(char *) value = NULL;
 
         if (virCgroupGetValueStr(parent,
@@ -1065,7 +1065,7 @@ virCgroupV1GetBlkioIoServiced(virCgroupPtr group,
         return -1;
 
     /* sum up all entries of the same kind, from all devices */
-    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
+    for (i = 0; i < G_N_ELEMENTS(value_names); i++) {
         p1 = str1;
         p2 = str2;
 
@@ -1171,7 +1171,7 @@ virCgroupV1GetBlkioIoDeviceServiced(virCgroupPtr group,
         return -1;
     }
 
-    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
+    for (i = 0; i < G_N_ELEMENTS(value_names); i++) {
         if (!(p1 = strstr(p1, value_names[i]))) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Cannot find byte %sstats for block device '%s'"),
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index ce8851f800..5d940b0209 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -730,7 +730,7 @@ virCgroupV2GetBlkioIoServiced(virCgroupPtr group,
     }
 
     /* sum up all entries of the same kind, from all devices */
-    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
+    for (i = 0; i < G_N_ELEMENTS(value_names); i++) {
         p1 = str1;
 
         while ((p1 = strstr(p1, value_names[i]))) {
@@ -799,7 +799,7 @@ virCgroupV2GetBlkioIoDeviceServiced(virCgroupPtr group,
         return -1;
     }
 
-    for (i = 0; i < ARRAY_CARDINALITY(value_names); i++) {
+    for (i = 0; i < G_N_ELEMENTS(value_names); i++) {
         if (!(p1 = strstr(p1, value_names[i]))) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Cannot find byte '%s' stats for block device '%s'"),
diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index 3a3ea227a5..87fabfbba1 100644
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -47,7 +47,7 @@ struct virHashInfo {
 };
 
 
-verify(ARRAY_CARDINALITY(hashinfo) == VIR_CRYPTO_HASH_LAST);
+verify(G_N_ELEMENTS(hashinfo) == VIR_CRYPTO_HASH_LAST);
 
 ssize_t
 virCryptoHashBuf(virCryptoHash hash,
diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index 1e59294fc3..f423305e11 100644
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -305,7 +305,7 @@ static const char virDBusBasicTypes[] = {
 
 static bool virDBusIsBasicType(char c)
 {
-    return !!memchr(virDBusBasicTypes, c, ARRAY_CARDINALITY(virDBusBasicTypes));
+    return !!memchr(virDBusBasicTypes, c, G_N_ELEMENTS(virDBusBasicTypes));
 }
 
 /*
diff --git a/src/util/virenum.h b/src/util/virenum.h
index ab443aa528..d68421b203 100644
--- a/src/util/virenum.h
+++ b/src/util/virenum.h
@@ -34,15 +34,15 @@ virEnumToString(const char * const *types,
     static const char *const name ## TypeList[] = { __VA_ARGS__ }; \
     const char *name ## TypeToString(int type) { \
         return virEnumToString(name ## TypeList, \
-                               ARRAY_CARDINALITY(name ## TypeList), \
+                               G_N_ELEMENTS(name ## TypeList), \
                                type); \
     } \
     int name ## TypeFromString(const char *type) { \
         return virEnumFromString(name ## TypeList, \
-                                 ARRAY_CARDINALITY(name ## TypeList), \
+                                 G_N_ELEMENTS(name ## TypeList), \
                                  type); \
     } \
-    verify(ARRAY_CARDINALITY(name ## TypeList) == lastVal)
+    verify(G_N_ELEMENTS(name ## TypeList) == lastVal)
 
 #define VIR_ENUM_DECL(name) \
     const char *name ## TypeToString(int type); \
diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index f6344b631c..0d4bfae8f8 100644
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -178,7 +178,7 @@ virFirewallValidateBackend(virFirewallBackend backend)
         };
         size_t i;
 
-        for (i = 0; i < ARRAY_CARDINALITY(commands); i++) {
+        for (i = 0; i < G_N_ELEMENTS(commands); i++) {
             if (!virFileIsExecutable(commands[i])) {
                 virReportSystemError(errno,
                                      _("direct firewall backend requested, but %s is not available"),
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 952766dc3a..d544d36c61 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -168,7 +168,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum,
         }
 
         param->value = 0;
-        for (j = 0; j < ARRAY_CARDINALITY(cpu_map[i].idx); j++)
+        for (j = 0; j < G_N_ELEMENTS(cpu_map[i].idx); j++)
             param->value += cpu_times[offset + cpu_map[i].idx[j]] * TICK_TO_NSEC;
     }
 
diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 0e3c0ad73a..e1b876d36c 100644
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -144,11 +144,11 @@ iptablesSetupPrivateChains(virFirewallLayer layer)
     bool changed = false;
     iptablesGlobalChainData data[] = {
         { layer, "filter",
-          filter_chains, ARRAY_CARDINALITY(filter_chains), &changed },
+          filter_chains, G_N_ELEMENTS(filter_chains), &changed },
         { layer, "nat",
-          natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+          natmangle_chains, G_N_ELEMENTS(natmangle_chains), &changed },
         { layer, "mangle",
-          natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+          natmangle_chains, G_N_ELEMENTS(natmangle_chains), &changed },
     };
     size_t i;
 
@@ -156,7 +156,7 @@ iptablesSetupPrivateChains(virFirewallLayer layer)
 
     virFirewallStartTransaction(fw, 0);
 
-    for (i = 0; i < ARRAY_CARDINALITY(data); i++)
+    for (i = 0; i < G_N_ELEMENTS(data); i++)
         virFirewallAddRuleFull(fw, data[i].layer,
                                false, iptablesPrivateChainCreate,
                                &(data[i]), "--table", data[i].table,
diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c
index 336443e01d..1a0a94e3ab 100644
--- a/src/util/virkeycode.c
+++ b/src/util/virkeycode.c
@@ -54,19 +54,19 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = {
     [VIR_KEYCODE_SET_QNUM] = virKeyCodeTable_qnum,
 };
 
-#define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux)
-
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset1));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset2));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_atset3));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_osx));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xtkbd));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_usb));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_win32));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_qnum));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_linux));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_osx));
-verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32));
+#define VIR_KEYMAP_ENTRY_MAX G_N_ELEMENTS(virKeyCodeTable_linux)
+
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_atset1));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_atset2));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_atset3));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_osx));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_xtkbd));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_usb));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_win32));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyCodeTable_qnum));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyNameTable_linux));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyNameTable_osx));
+verify(VIR_KEYMAP_ENTRY_MAX == G_N_ELEMENTS(virKeyNameTable_win32));
 
 VIR_ENUM_IMPL(virKeycodeSet,
               VIR_KEYCODE_SET_LAST,
diff --git a/src/util/virlog.c b/src/util/virlog.c
index 4414a8fa63..5881a59cc5 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -702,7 +702,7 @@ virLogStackTraceToFd(int fd)
     const char *msg = "Stack trace not available on this platform\n";
 
 #define STRIP_DEPTH 3
-    size = backtrace(array, ARRAY_CARDINALITY(array));
+    size = backtrace(array, G_N_ELEMENTS(array));
     if (size) {
         backtrace_symbols_fd(array +  STRIP_DEPTH, size - STRIP_DEPTH, fd);
         ignore_value(safewrite(fd, "\n", 1));
@@ -1004,9 +1004,9 @@ virLogOutputToJournald(virLogSourcePtr source,
     struct journalState state;
 
     state.iov = iov;
-    state.iov_end = iov + ARRAY_CARDINALITY(iov);
+    state.iov_end = iov + G_N_ELEMENTS(iov);
     state.bufs = iov_bufs;
-    state.bufs_end = iov_bufs + ARRAY_CARDINALITY(iov_bufs);
+    state.bufs_end = iov_bufs + G_N_ELEMENTS(iov_bufs);
 
     journalAddString(&state, "MESSAGE", rawstr);
     journalAddInt(&state, "PRIORITY",
diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index d3f1595ae4..894ae86a16 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -3050,7 +3050,7 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
     };
 # endif
 
-    for (i = 0; i < ARRAY_CARDINALITY(ethtool_cmds); i++) {
+    for (i = 0; i < G_N_ELEMENTS(ethtool_cmds); i++) {
         cmd.cmd = ethtool_cmds[i].cmd;
         if (virNetDevFeatureAvailable(fd, ifr, &cmd))
             ignore_value(virBitmapSetBit(bitmap, ethtool_cmds[i].feat));
@@ -3059,7 +3059,7 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
 # if HAVE_DECL_ETHTOOL_GFLAGS
     cmd.cmd = ETHTOOL_GFLAGS;
     if (virNetDevFeatureAvailable(fd, ifr, &cmd)) {
-        for (i = 0; i < ARRAY_CARDINALITY(flags); i++) {
+        for (i = 0; i < G_N_ELEMENTS(flags); i++) {
             if (cmd.data & flags[i].cmd)
                 ignore_value(virBitmapSetBit(bitmap, flags[i].feat));
         }
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 0b1f3262f4..f07eb2f2e2 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -253,7 +253,7 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t src_pid,
     fds[0].fd = fd;
     fds[0].events = POLLIN;
 
-    n = poll(fds, ARRAY_CARDINALITY(fds), NETLINK_ACK_TIMEOUT_S);
+    n = poll(fds, G_N_ELEMENTS(fds), NETLINK_ACK_TIMEOUT_S);
     if (n <= 0) {
         if (n < 0)
             virReportSystemError(errno, "%s",
diff --git a/src/util/virperf.c b/src/util/virperf.c
index 7714d57f6b..e334d415e4 100644
--- a/src/util/virperf.c
+++ b/src/util/virperf.c
@@ -168,7 +168,7 @@ static struct virPerfEventAttr attrs[] = {
         .attrConfig = PERF_COUNT_SW_EMULATION_FAULTS
     },
 };
-verify(ARRAY_CARDINALITY(attrs) == VIR_PERF_EVENT_LAST);
+verify(G_N_ELEMENTS(attrs) == VIR_PERF_EVENT_LAST);
 typedef struct virPerfEventAttr *virPerfEventAttrPtr;
 
 
diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index c91301e525..e8d4ba08b4 100644
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -628,7 +628,7 @@ int virProcessGetNamespaces(pid_t pid,
     *nfdlist = 0;
     *fdlist = NULL;
 
-    for (i = 0; i < ARRAY_CARDINALITY(ns); i++) {
+    for (i = 0; i < G_N_ELEMENTS(ns); i++) {
         int fd;
         VIR_AUTOFREE(char *) nsfile = NULL;
 
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index ef6d7f3ba5..6c2693fec9 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -387,7 +387,7 @@ static struct FileTypeInfo const fileTypeInfo[] = {
         4+4+4, 8, 512, NULL, vmdk4GetBackingStore, NULL
     },
 };
-verify(ARRAY_CARDINALITY(fileTypeInfo) == VIR_STORAGE_FILE_LAST);
+verify(G_N_ELEMENTS(fileTypeInfo) == VIR_STORAGE_FILE_LAST);
 
 
 /* qcow2 compatible features in the order they appear on-disk */
@@ -401,7 +401,7 @@ enum qcow2CompatibleFeature {
 static const int qcow2CompatibleFeatureArray[] = {
     VIR_STORAGE_FILE_FEATURE_LAZY_REFCOUNTS,
 };
-verify(ARRAY_CARDINALITY(qcow2CompatibleFeatureArray) ==
+verify(G_N_ELEMENTS(qcow2CompatibleFeatureArray) ==
        QCOW2_COMPATIBLE_FEATURE_LAST);
 
 static int
@@ -3640,7 +3640,7 @@ virStorageSourceParseBackingJSONInternal(virStorageSourcePtr src,
         return -1;
     }
 
-    for (i = 0; i < ARRAY_CARDINALITY(jsonParsers); i++) {
+    for (i = 0; i < G_N_ELEMENTS(jsonParsers); i++) {
         if (STREQ(drvname, jsonParsers[i].drvname))
             return jsonParsers[i].func(src, file, jsonParsers[i].opaque);
     }
diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index b5d5cb7236..26056bf503 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -64,7 +64,7 @@ virTPMCreateCancelPath(const char *devpath)
         dev = strrchr(devpath, '/');
         if (dev) {
             dev++;
-            for (i = 0; i < ARRAY_CARDINALITY(prefix); i++) {
+            for (i = 0; i < G_N_ELEMENTS(prefix); i++) {
                 if (virAsprintf(&path, "/sys/class/%s%s/device/cancel",
                                 prefix[i], dev) < 0)
                      goto cleanup;
@@ -290,7 +290,7 @@ virTPMEmulatorInit(void)
 
     virMutexLock(&swtpm_tools_lock);
 
-    for (i = 0; i < ARRAY_CARDINALITY(prgs); i++) {
+    for (i = 0; i < G_N_ELEMENTS(prgs); i++) {
         VIR_AUTOFREE(char *) path = NULL;
         bool findit = *prgs[i].path == NULL;
         struct stat statbuf;
diff --git a/src/util/virutil.c b/src/util/virutil.c
index aae07d48e6..940c6d70e1 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -386,7 +386,7 @@ int virDiskNameParse(const char *name, int *disk, int *partition)
     static char const* const drive_prefix[] = {"fd", "hd", "vd", "sd", "xvd", "ubd"};
     size_t i;
 
-    for (i = 0; i < ARRAY_CARDINALITY(drive_prefix); i++) {
+    for (i = 0; i < G_N_ELEMENTS(drive_prefix); i++) {
         if (STRPREFIX(name, drive_prefix[i])) {
             ptr = name + strlen(drive_prefix[i]);
             break;
@@ -1108,7 +1108,7 @@ virGetWin32DirectoryRoot(char **path)
 
     *path = NULL;
 
-    if (GetWindowsDirectory(windowsdir, ARRAY_CARDINALITY(windowsdir))) {
+    if (GetWindowsDirectory(windowsdir, G_N_ELEMENTS(windowsdir))) {
         const char *tmp;
         /* Usually X:\Windows, but in terminal server environments
          * might be an UNC path, AFAIK.