From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 8 Jul 2013 14:09:33 +0000 (+0100)
Subject: Convert 'int i' to 'size_t i' in examples/ files
X-Git-Tag: CVE-2013-4154~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75825494c729a7ce0687ed1602a332c179f7505a;p=thirdparty%2Flibvirt.git

Convert 'int i' to 'size_t i' in examples/ files

Convert the type of loop iterators named 'i', 'j', k',
'ii', 'jj', 'kk', to be 'size_t' instead of 'int' or
'unsigned int', also santizing 'ii', 'jj', 'kk' to use
the normal 'i', 'j', 'k' naming

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c
index 1b425fbd9d..e9b3881e55 100644
--- a/examples/domain-events/events-c/event-test.c
+++ b/examples/domain-events/events-c/event-test.c
@@ -320,7 +320,7 @@ static int myDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
                                          virDomainEventGraphicsSubjectPtr subject,
                                          void *opaque ATTRIBUTE_UNUSED)
 {
-    int i;
+    size_t i;
     printf("%s EVENT: Domain %s(%d) graphics ", __func__, virDomainGetName(dom),
            virDomainGetID(dom));
 
diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c
index d9f56bb3fe..6a0f5c9b1f 100644
--- a/examples/domsuspend/suspend.c
+++ b/examples/domsuspend/suspend.c
@@ -107,15 +107,17 @@ int main(int argc, char **argv) {
         id = atoi(argv[1]);
     }
     if (id == 0) {
-        int i, j, ids[10];
-        i = virConnectListDomains(conn, &ids[0], 10);
-        if (i < 0) {
+        int n;
+        size_t i;
+        int ids[10];
+        n = virConnectListDomains(conn, &ids[0], 10);
+        if (n < 0) {
             fprintf(stderr, "Failed to list the domains\n");
             goto error;
         }
-        for (j = 0; j < i; j++) {
-            if (ids[j] != 0) {
-                id = ids[j];
+        for (i = 0; i < n; i++) {
+            if (ids[i] != 0) {
+                id = ids[i];
                 break;
             }
         }
diff --git a/examples/hellolibvirt/hellolibvirt.c b/examples/hellolibvirt/hellolibvirt.c
index 4ae60fc507..83045b1dc4 100644
--- a/examples/hellolibvirt/hellolibvirt.c
+++ b/examples/hellolibvirt/hellolibvirt.c
@@ -54,7 +54,8 @@ out:
 static int
 showDomains(virConnectPtr conn)
 {
-    int ret = 0, i, numNames, numInactiveDomains, numActiveDomains;
+    int ret = 0, numNames, numInactiveDomains, numActiveDomains;
+    size_t i;
     int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE |
                 VIR_CONNECT_LIST_DOMAINS_INACTIVE;
     virDomainPtr *nameList = NULL;
diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c
index 628451cdb4..e7058febb4 100644
--- a/examples/openauth/openauth.c
+++ b/examples/openauth/openauth.c
@@ -90,7 +90,8 @@ out:
 static int
 showDomains(virConnectPtr conn)
 {
-    int ret = 0, i, numNames, numInactiveDomains, numActiveDomains;
+    int ret = 0, numNames, numInactiveDomains, numActiveDomains;
+    size_t i;
     char **nameList = NULL;
 
     numActiveDomains = virConnectNumOfDomains(conn);
@@ -161,7 +162,7 @@ typedef struct _AuthData AuthData;
 static int
 authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata)
 {
-    int i;
+    size_t i;
     AuthData *authData = cbdata;
 
     /* libvirt might request multiple credentials in a single call.