[Libvir] [PATCH] Allow maxnames to be 0 in List{, Defined}{Domains, Networks}

[Richard W.M. Jones]

It seems a bit pathological to check if maxNames <= 0 and throw an error if it is 0. In particular if you don't have any defined domains or networks (both fairly common scenarios) then this causes an error when you just pass the result of NumOfNetworks straight into ListNetworks. Backend drivers & QEMU seem to have no problem with maxNames being zero, so let's allow it.

Rich.

--
Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/
Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod
Street, Windsor, Berkshire, SL4 1TE, United Kingdom.  Registered in
England and Wales under Company Registration No. 03798903

Index: src/libvirt.c
===================================================================
RCS file: /data/cvs/libvirt/src/libvirt.c,v
retrieving revision 1.77
diff -u -p -r1.77 libvirt.c
--- src/libvirt.c	20 Jun 2007 17:25:39 -0000	1.77
+++ src/libvirt.c	22 Jun 2007 16:58:02 -0000
@@ -510,7 +510,7 @@ virConnectListDomains(virConnectPtr conn
         return (-1);
     }
 
-    if ((ids == NULL) || (maxids <= 0)) {
+    if ((ids == NULL) || (maxids < 0)) {
         virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
         return (-1);
     }
@@ -1682,7 +1682,7 @@ virConnectListDefinedDomains(virConnectP
         return (-1);
     }
 
-    if ((names == NULL) || (maxnames <= 0)) {
+    if ((names == NULL) || (maxnames < 0)) {
         virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
         return (-1);
     }
@@ -2077,7 +2077,7 @@ virConnectListNetworks(virConnectPtr con
         return (-1);
     }
 
-    if ((names == NULL) || (maxnames <= 0)) {
+    if ((names == NULL) || (maxnames < 0)) {
         virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
         return (-1);
     }
@@ -2131,7 +2131,7 @@ virConnectListDefinedNetworks(virConnect
         return (-1);
     }
 
-    if ((names == NULL) || (maxnames <= 0)) {
+    if ((names == NULL) || (maxnames < 0)) {
         virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
         return (-1);
     }

smime.p7s
Description: S/MIME Cryptographic Signature

--
Libvir-list mailing list
Libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list