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

daniel

diff --git a/ChangeLog b/ChangeLog
index d825e56213f10caa1404e09fcafe45e7276fa545..7d42b10068f1bc82263f85340751a32b14a82122 100644 (file)
--- 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 445d3fb9ef6ed61fc1cfd1b5d88a58cc8e025aec..b146b97dccc7edafb7e26d7bac037a3d7a19a782 100644 (file)
--- 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) {