[virt-tools-list] [PATCH virt-viewer 3/3] util: get rid of ARRAY_CARDINALITY

Marc-André Lureau marcandre.lureau at gmail.com
Tue Jun 10 15:40:03 UTC 2014


---
 src/virt-viewer-util.h | 2 --
 src/virt-viewer.c      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/virt-viewer-util.h b/src/virt-viewer-util.h
index 4f40116..287f9bd 100644
--- a/src/virt-viewer-util.h
+++ b/src/virt-viewer-util.h
@@ -32,8 +32,6 @@ enum {
     VIRT_VIEWER_ERROR_FAILED,
 };
 
-#define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-
 #define VIRT_VIEWER_ERROR virt_viewer_error_quark ()
 
 GQuark virt_viewer_error_quark(void);
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 4593a11..8a1d8c5 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -672,7 +672,7 @@ virt_viewer_connect(VirtViewerApp *app)
         { VIR_CRED_AUTHNAME, VIR_CRED_PASSPHRASE };
     virConnectAuth auth_libvirt = {
         .credtype = cred_types,
-        .ncredtype = ARRAY_CARDINALITY(cred_types),
+        .ncredtype = G_N_ELEMENTS(cred_types),
         .cb = virt_viewer_auth_libvirt_credentials,
         .cbdata = app,
     };
-- 
1.9.3




More information about the virt-tools-list mailing list