Convert 'int i' to 'size_t i' in src/security 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/src/security/security_dac.c b/src/security/security_dac.c
index 365ab8b221c859cfcf2d73347d325df54a8a8ca4..baa987ccf9474588a5d01e4d2e583f6c97b8ac54 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -834,7 +834,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
                                       int migrated)
 {
     virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-    int i;
+    size_t i;
     int rc = 0;
 
     if (!priv->dynamicOwnership)
@@ -904,7 +904,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 7920b93644fba94f5ed7af242ad93a0ce2d8240d..d8a8283871c10b6f46042bc8d727fde4467c6383 100644 (file)
--- 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 00ee41ed61dc70886c53e790fa30a6ec046f6213..e3dce66a2d7cb1787046e9ae82f431cf8c5ec541 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1826,7 +1826,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);
@@ -2227,7 +2227,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/security_stack.c b/src/security/security_stack.c
index 9afc6418d7637226a7903fdfe697e51afed7ba83..1e229d7e768932011a085850e2f77d103e902a45 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -513,7 +513,8 @@ virSecurityStackGetNested(virSecurityManagerPtr mgr)
     virSecurityManagerPtr *list = NULL;
     virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityStackItemPtr item;
-    int len = 0, i = 0;
+    int len = 0;
+    size_t i;
 
     for (item = priv->itemsHead; item; item = item->next)
         len++;
@@ -521,7 +522,7 @@ virSecurityStackGetNested(virSecurityManagerPtr mgr)
     if (VIR_ALLOC_N(list, len + 1) < 0)
         return NULL;
 
-    for (item = priv->itemsHead; item; item = item->next, i++)
+    for (i = 0, item = priv->itemsHead; item; item = item->next, i++)
         list[i] = item->securityManager;
     list[len] = NULL;
 

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 432f05906721920888ad8c7c46818e82deaae3c3..b9282b4efeaee95cd9f69fdfecee4ebfe8c1cb68 100644 (file)
--- 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];