[libvirt] [PATCH 12/32] Convert 'int i' to 'size_t i' in src/security files

Daniel P. Berrange berrange at redhat.com
Mon Jul 8 14:21:16 UTC 2013


From: "Daniel P. Berrange" <berrange at redhat.com>

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 at redhat.com>
---
 src/security/security_dac.c     | 4 ++--
 src/security/security_driver.c  | 2 +-
 src/security/security_selinux.c | 4 ++--
 src/security/virt-aa-helper.c   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 0d6defc..a347d8f 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -838,7 +838,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
                                       int migrated)
 {
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-    int i;
+    size_t i;
     int rc = 0;
 
     if (!priv->dynamicOwnership)
@@ -908,7 +908,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
                                   const char *stdin_path ATTRIBUTE_UNUSED)
 {
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-    int i;
+    size_t i;
     uid_t user;
     gid_t group;
 
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 7920b93..d8a8283 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -53,7 +53,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
                                              const char *virtDriver)
 {
     virSecurityDriverPtr drv = NULL;
-    int i;
+    size_t i;
 
     VIR_DEBUG("name=%s", NULLSTR(name));
 
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 7802dda..b44154c 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1845,7 +1845,7 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
 {
     virSecurityLabelDefPtr secdef;
     virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
-    int i;
+    size_t i;
     int rc = 0;
 
     VIR_DEBUG("Restoring security label on %s", def->name);
@@ -2246,7 +2246,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
                                       virDomainDefPtr def,
                                       const char *stdin_path)
 {
-    int i;
+    size_t i;
     virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
     virSecurityLabelDefPtr secdef;
 
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 02359fc..834ee04 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -498,7 +498,7 @@ valid_name(const char *name)
 static int
 array_starts_with(const char *str, const char * const *arr, const long size)
 {
-    int i;
+    size_t i;
     for (i = 0; i < size; i++) {
         if (strlen(str) < strlen(arr[i]))
             continue;
@@ -890,7 +890,7 @@ get_files(vahControl * ctl)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     int rc = -1;
-    int i;
+    size_t i;
     char *uuid;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
 
-- 
1.8.1.4




More information about the libvir-list mailing list