5 a.m.
---
src/security/security_dac.c | 8 ++++----
src/security/security_driver.c | 2 +-
src/security/security_selinux.c | 8 ++++----
src/security/virt-aa-helper.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 6e6fcad..d922ad2 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -847,14 +847,14 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
VIR_DEBUG("Restoring security label on %s migrated=%d",
def->name, migrated);
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACRestoreSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
NULL) < 0)
rc = -1;
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (virSecurityDACRestoreSecurityImageLabelInt(mgr,
def,
def->disks[i],
@@ -914,7 +914,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (!priv->dynamicOwnership)
return 0;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR)
continue;
@@ -923,7 +923,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
def->disks[i]) < 0)
return -1;
}
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecurityDACSetSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
diff --git a/src/security/security_driver.c b/src/security/security_driver.c
index 319b86f..7920b93 100644
--- a/src/security/security_driver.c
+++ b/src/security/security_driver.c
@@ -57,7 +57,7 @@ virSecurityDriverPtr virSecurityDriverLookup(const char *name,
VIR_DEBUG("name=%s", NULLSTR(name));
- for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv ; i++) {
+ for (i = 0; i < ARRAY_CARDINALITY(security_drivers) && !drv; i++) {
virSecurityDriverPtr tmp = security_drivers[i];
if (name &&
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 5d108b9..1781c86 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1887,14 +1887,14 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr
mgr,
rc = -1;
}
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxRestoreSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
NULL) < 0)
rc = -1;
}
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
if (virSecuritySELinuxRestoreSecurityImageLabelInt(mgr,
def,
def->disks[i],
@@ -2281,7 +2281,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
if (secdef->norelabel || data->skipAllLabel)
return 0;
- for (i = 0 ; i < def->ndisks ; i++) {
+ for (i = 0; i < def->ndisks; i++) {
/* XXX fixme - we need to recursively label the entire tree :-( */
if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) {
VIR_WARN("Unable to relabel directory tree %s for disk %s",
@@ -2294,7 +2294,7 @@ virSecuritySELinuxSetSecurityAllLabel(virSecurityManagerPtr mgr,
}
/* XXX fixme process def->fss if relabel == true */
- for (i = 0 ; i < def->nhostdevs ; i++) {
+ for (i = 0; i < def->nhostdevs; i++) {
if (virSecuritySELinuxSetSecurityHostdevLabel(mgr,
def,
def->hostdevs[i],
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 5d48850..6f63c37 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -952,7 +952,7 @@ get_files(vahControl * ctl)
ctl->def->consoles[i]->source.data.file.path,
"rw") != 0)
goto cleanup;
- for (i = 0 ; i < ctl->def->nparallels; i++)
+ for (i = 0; i < ctl->def->nparallels; i++)
if (ctl->def->parallels[i] &&
(ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
@@ -965,7 +965,7 @@ get_files(vahControl * ctl)
ctl->def->parallels[i]->source.type) != 0)
goto cleanup;
- for (i = 0 ; i < ctl->def->nchannels; i++)
+ for (i = 0; i < ctl->def->nchannels; i++)
if (ctl->def->channels[i] &&
(ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY ||
ctl->def->channels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV ||
--
1.8.1.4