[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Richard W.M. Jones]

The following commit has been merged in the experimental branch:
commit 51f7c6bb82e3582ed78767d8748eb1abbb0a7d48
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed May 8 11:50:09 2013 +0100

    Use size_t for loop iterators.

diff --git a/src/drives.c b/src/drives.c
index cde6a32..3fa2edb 100644
--- a/src/drives.c
+++ b/src/drives.c
@@ -1129,23 +1129,26 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
     CLEANUP_FREE char *mon_host = NULL, *username = NULL, *secret = NULL;
     const char *auth;
     size_t n = 0;
-    for (int i = 0; i < src->nr_servers; i++) {
+    size_t i, j;
+
+    for (i = 0; i < src->nr_servers; i++) {
       n += strlen (src->servers[i].u.hostname);
       n += 8; /* for slashes, colons, & port numbers */
     }
     n++; /* for \0 */
     mon_host = safe_malloc (g, sizeof (char *) * n);
     n = 0;
-    for (int i = 0; i < src->nr_servers; i++) {
-      for (int j = 0; j < strlen (src->servers[i].u.hostname); j++) {
+    for (i = 0; i < src->nr_servers; i++) {
+      CLEANUP_FREE char *port = NULL;
+
+      for (j = 0; j < strlen (src->servers[i].u.hostname); j++)
         mon_host[n++] = src->servers[i].u.hostname[j];
-      }
       mon_host[n++] = '\\';
       mon_host[n++] = ':';
-      CLEANUP_FREE char *port = safe_asprintf (g, "%d", src->servers[i].port);
-      for (int j = 0; j < strlen (port); j++) {
+      port = safe_asprintf (g, "%d", src->servers[i].port);
+      for (j = 0; j < strlen (port); j++)
         mon_host[n++] = port[j];
-      }
+
       /* join each host with \; */
       if (i != src->nr_servers - 1) {
         mon_host[n++] = '\\';

-- 
Libguestfs Debian packaging