NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert 'int i' to 'size_t i' in src/security files

Browse Source 
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>
This commit is contained in:
Daniel P. Berrange 2013-07-08 15:09:33 +01:00
parent 71c7fcdb35
commit 716961372e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/security/security_dac.c
View File

@ -834,7 +834,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
int migrated) int migrated)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
int i; size_t i;
int rc = 0; int rc = 0;
if (!priv->dynamicOwnership) if (!priv->dynamicOwnership)
@ -904,7 +904,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
const char *stdin_path ATTRIBUTE_UNUSED) const char *stdin_path ATTRIBUTE_UNUSED)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
int i; size_t i;
uid_t user; uid_t user;
gid_t group; gid_t group;

2
src/security/security_driver.c
View File

@ -53,7 +53,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
const char *virtDriver) const char *virtDriver)
{ {
virSecurityDriverPtr drv = NULL; virSecurityDriverPtr drv = NULL;
int i; size_t i;
VIR_DEBUG("name=%s", NULLSTR(name)); VIR_DEBUG("name=%s", NULLSTR(name));

4
src/security/security_selinux.c
View File

@ -1826,7 +1826,7 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
{ {
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;
virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
int i; size_t i;
int rc = 0; int rc = 0;
VIR_DEBUG("Restoring security label on %s", def->name); VIR_DEBUG("Restoring security label on %s", def->name);
@ -2227,7 +2227,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
const char *stdin_path) const char *stdin_path)
{ {
int i; size_t i;
virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr); virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr secdef; virSecurityLabelDefPtr secdef;

5
src/security/security_stack.c
View File

@ -513,7 +513,8 @@ virSecurityStackGetNested(virSecurityManagerPtr mgr)
virSecurityManagerPtr *list = NULL; virSecurityManagerPtr *list = NULL;
virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityStackItemPtr item; virSecurityStackItemPtr item;
int len = 0, i = 0; int len = 0;
size_t i;
for (item = priv->itemsHead; item; item = item->next) for (item = priv->itemsHead; item; item = item->next)
len++; len++;
@ -521,7 +522,7 @@ virSecurityStackGetNested(virSecurityManagerPtr mgr)
if (VIR_ALLOC_N(list, len + 1) < 0) if (VIR_ALLOC_N(list, len + 1) < 0)
return NULL; 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[i] = item->securityManager;
list[len] = NULL; list[len] = NULL;

4
src/security/virt-aa-helper.c
View File

@ -498,7 +498,7 @@ valid_name(const char *name)
static int static int
array_starts_with(const char *str, const char * const *arr, const long size) array_starts_with(const char *str, const char * const *arr, const long size)
{ {
int i; size_t i;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (strlen(str) < strlen(arr[i])) if (strlen(str) < strlen(arr[i]))
continue; continue;
@ -890,7 +890,7 @@ get_files(vahControl * ctl)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
int rc = -1; int rc = -1;
int i; size_t i;
char *uuid; char *uuid;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];