From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 9 Mar 2007 13:44:24 +0000 (+0000)
Subject: * src/virsh.c: bad pointer/int mismatch fixes from Richard Jones
X-Git-Tag: LIBVIRT_0_2_1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35adb383697da37df7130a015cee533ad804642;p=thirdparty%2Flibvirt.git

* src/virsh.c: bad pointer/int mismatch fixes from Richard Jones
daniel
---

diff --git a/ChangeLog b/ChangeLog
index d825e56213..7d42b10068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar  9 14:43:11 CET 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/virsh.c: bad pointer/int mismatch fixes from Richard Jones
+
 Thu Mar  8 22:07:14 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/conf.c: Fix double free in XML parsing routine
diff --git a/src/virsh.c b/src/virsh.c
index 445d3fb9ef..b146b97dcc 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1957,15 +1957,16 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED)
             return FALSE;
         }
         if (maxactive) {
-            activeNames = vshMalloc(ctl, sizeof(int) * maxactive);
+            activeNames = vshMalloc(ctl, sizeof(char *) * maxactive);
 
-            if ((maxactive = virConnectListNetworks(ctl->conn, &activeNames[0], maxactive)) < 0) {
+            if ((maxactive = virConnectListNetworks(ctl->conn, activeNames,
+	                                            maxactive)) < 0) {
                 vshError(ctl, FALSE, _("Failed to list active networks"));
                 free(activeNames);
                 return FALSE;
             }
 
-            qsort(&activeNames[0], maxactive, sizeof(int), namesorter);
+            qsort(&activeNames[0], maxactive, sizeof(char *), namesorter);
         }
     }
     if (inactive) {