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

storage/: Remove spaces after casts

Browse Source 
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Martin Kletzander 2018-04-25 14:42:34 +02:00
parent 156f03ec59
commit d80b84c68b
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/storage_backend_gluster.c
View File

@ -349,7 +349,7 @@ virStorageBackendGlusterRefreshPool(virStoragePoolObjPtr pool)
struct { struct {
struct dirent ent; struct dirent ent;
/* See comment below about readdir_r needing padding */ /* See comment below about readdir_r needing padding */
char padding[MAX(1, 256 - (int) (sizeof(struct dirent) char padding[MAX(1, 256 - (int)(sizeof(struct dirent)
- offsetof(struct dirent, d_name)))]; - offsetof(struct dirent, d_name)))];
} de; } de;
struct dirent *ent; struct dirent *ent;
@ -430,7 +430,7 @@ virStorageBackendGlusterVolDelete(virStoragePoolObjPtr pool,
virCheckFlags(0, -1); virCheckFlags(0, -1);
switch ((virStorageVolType) vol->type) { switch ((virStorageVolType)vol->type) {
case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_FILE:
case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_DIR:
case VIR_STORAGE_VOL_BLOCK: case VIR_STORAGE_VOL_BLOCK:

2
src/storage/storage_backend_logical.c
View File

@ -1005,7 +1005,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr pool,
goto error; goto error;
} }
} }
if (fchmod(fd, (vol->target.perms->mode == (mode_t) -1 ? if (fchmod(fd, (vol->target.perms->mode == (mode_t)-1 ?
VIR_STORAGE_DEFAULT_VOL_PERM_MODE : VIR_STORAGE_DEFAULT_VOL_PERM_MODE :
vol->target.perms->mode)) < 0) { vol->target.perms->mode)) < 0) {
virReportSystemError(errno, virReportSystemError(errno,

6
src/storage/storage_backend_vstorage.c
View File

@ -45,11 +45,11 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool)
char *mode = NULL; char *mode = NULL;
/* Check the permissions */ /* Check the permissions */
if (def->target.perms.mode == (mode_t) - 1) if (def->target.perms.mode == (mode_t)-1)
def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; def->target.perms.mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE;
if (def->target.perms.uid == (uid_t) -1) if (def->target.perms.uid == (uid_t)-1)
def->target.perms.uid = geteuid(); def->target.perms.uid = geteuid();
if (def->target.perms.gid == (gid_t) -1) if (def->target.perms.gid == (gid_t)-1)
def->target.perms.gid = getegid(); def->target.perms.gid = getegid();
/* Convert ids to names because vstorage uses names */ /* Convert ids to names because vstorage uses names */

6
src/storage/storage_driver.c
View File

@ -1513,7 +1513,7 @@ static bool
storageVolLookupByKeyCallback(virStoragePoolObjPtr obj, storageVolLookupByKeyCallback(virStoragePoolObjPtr obj,
const void *opaque) const void *opaque)
{ {
struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; struct storageVolLookupData *data = (struct storageVolLookupData *)opaque;
if (virStoragePoolObjIsActive(obj)) if (virStoragePoolObjIsActive(obj))
data->voldef = virStorageVolDefFindByKey(obj, data->key); data->voldef = virStorageVolDefFindByKey(obj, data->key);
@ -1556,7 +1556,7 @@ static bool
storageVolLookupByPathCallback(virStoragePoolObjPtr obj, storageVolLookupByPathCallback(virStoragePoolObjPtr obj,
const void *opaque) const void *opaque)
{ {
struct storageVolLookupData *data = (struct storageVolLookupData *) opaque; struct storageVolLookupData *data = (struct storageVolLookupData *)opaque;
virStoragePoolDefPtr def; virStoragePoolDefPtr def;
char *stable_path = NULL; char *stable_path = NULL;
@ -1565,7 +1565,7 @@ storageVolLookupByPathCallback(virStoragePoolObjPtr obj,
def = virStoragePoolObjGetDef(obj); def = virStoragePoolObjGetDef(obj);
switch ((virStoragePoolType) def->type) { switch ((virStoragePoolType)def->type) {
case VIR_STORAGE_POOL_DIR: case VIR_STORAGE_POOL_DIR:
case VIR_STORAGE_POOL_FS: case VIR_STORAGE_POOL_FS:
case VIR_STORAGE_POOL_NETFS: case VIR_STORAGE_POOL_NETFS:

44
src/storage/storage_util.c
View File

@ -271,19 +271,19 @@ storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
goto cleanup; goto cleanup;
} }
uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid
: (uid_t) -1; : (uid_t)-1;
gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid
: (gid_t) -1; : (gid_t)-1;
if (((uid != (uid_t) -1) || (gid != (gid_t) -1)) if (((uid != (uid_t)-1) || (gid != (gid_t)-1))
&& (fchown(fd, uid, gid) < 0)) { && (fchown(fd, uid, gid) < 0)) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot chown '%s' to (%u, %u)"), _("cannot chown '%s' to (%u, %u)"),
vol->target.path, (unsigned int) uid, vol->target.path, (unsigned int)uid,
(unsigned int) gid); (unsigned int)gid);
goto cleanup; goto cleanup;
} }
mode = (vol->target.perms->mode == (mode_t) -1 ? mode = (vol->target.perms->mode == (mode_t)-1 ?
VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode); VIR_STORAGE_DEFAULT_VOL_PERM_MODE : vol->target.perms->mode);
if (fchmod(fd, mode) < 0) { if (fchmod(fd, mode) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
@ -433,7 +433,7 @@ storageBackendCreateRaw(virStoragePoolObjPtr pool,
if (def->type == VIR_STORAGE_POOL_NETFS) if (def->type == VIR_STORAGE_POOL_NETFS)
operation_flags |= VIR_FILE_OPEN_FORK; operation_flags |= VIR_FILE_OPEN_FORK;
if (vol->target.perms->mode != (mode_t) -1) if (vol->target.perms->mode != (mode_t)-1)
open_mode = vol->target.perms->mode; open_mode = vol->target.perms->mode;
if ((fd = virFileOpenAs(vol->target.path, if ((fd = virFileOpenAs(vol->target.path,
@ -595,7 +595,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
struct stat st; struct stat st;
gid_t gid; gid_t gid;
uid_t uid; uid_t uid;
mode_t mode = (vol->target.perms->mode == (mode_t) -1 ? mode_t mode = (vol->target.perms->mode == (mode_t)-1 ?
VIR_STORAGE_DEFAULT_VOL_PERM_MODE : VIR_STORAGE_DEFAULT_VOL_PERM_MODE :
vol->target.perms->mode); vol->target.perms->mode);
bool filecreated = false; bool filecreated = false;
@ -603,9 +603,9 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
if ((def->type == VIR_STORAGE_POOL_NETFS) if ((def->type == VIR_STORAGE_POOL_NETFS)
&& (((geteuid() == 0) && (((geteuid() == 0)
&& (vol->target.perms->uid != (uid_t) -1) && (vol->target.perms->uid != (uid_t)-1)
&& (vol->target.perms->uid != 0)) && (vol->target.perms->uid != 0))
|| ((vol->target.perms->gid != (gid_t) -1) || ((vol->target.perms->gid != (gid_t)-1)
&& (vol->target.perms->gid != getegid())))) { && (vol->target.perms->gid != getegid())))) {
virCommandSetUID(cmd, vol->target.perms->uid); virCommandSetUID(cmd, vol->target.perms->uid);
@ -656,15 +656,15 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool,
} }
uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid uid = (vol->target.perms->uid != st.st_uid) ? vol->target.perms->uid
: (uid_t) -1; : (uid_t)-1;
gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid gid = (vol->target.perms->gid != st.st_gid) ? vol->target.perms->gid
: (gid_t) -1; : (gid_t)-1;
if (((uid != (uid_t) -1) || (gid != (gid_t) -1)) if (((uid != (uid_t)-1) || (gid != (gid_t)-1))
&& (chown(vol->target.path, uid, gid) < 0)) { && (chown(vol->target.path, uid, gid) < 0)) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot chown %s to (%u, %u)"), _("cannot chown %s to (%u, %u)"),
vol->target.path, (unsigned int) uid, vol->target.path, (unsigned int)uid,
(unsigned int) gid); (unsigned int)gid);
goto cleanup; goto cleanup;
} }
@ -730,7 +730,7 @@ storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
if (!inputvol) { if (!inputvol) {
if ((virDirCreate(vol->target.path, if ((virDirCreate(vol->target.path,
(vol->target.perms->mode == (mode_t) -1 ? (vol->target.perms->mode == (mode_t)-1 ?
VIR_STORAGE_DEFAULT_VOL_PERM_MODE: VIR_STORAGE_DEFAULT_VOL_PERM_MODE:
vol->target.perms->mode), vol->target.perms->mode),
vol->target.perms->uid, vol->target.perms->uid,
@ -1354,8 +1354,8 @@ storageBackendCreateQemuImgSecretPath(virStoragePoolObjPtr pool,
} }
VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(fd);
if ((vol->target.perms->uid != (uid_t) -1) && if ((vol->target.perms->uid != (uid_t)-1) &&
(vol->target.perms->gid != (gid_t) -1)) { (vol->target.perms->gid != (gid_t)-1)) {
if (chown(secretPath, vol->target.perms->uid, if (chown(secretPath, vol->target.perms->uid,
vol->target.perms->gid) < 0) { vol->target.perms->gid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -2105,7 +2105,7 @@ createFileDir(virStoragePoolObjPtr pool,
if ((err = virDirCreate(vol->target.path, if ((err = virDirCreate(vol->target.path,
(vol->target.perms->mode == (mode_t) -1 ? (vol->target.perms->mode == (mode_t)-1 ?
VIR_STORAGE_DEFAULT_VOL_PERM_MODE : VIR_STORAGE_DEFAULT_VOL_PERM_MODE :
vol->target.perms->mode), vol->target.perms->mode),
vol->target.perms->uid, vol->target.perms->uid,
@ -2236,7 +2236,7 @@ virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
switch ((virStorageVolType) vol->type) { switch ((virStorageVolType)vol->type) {
case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_FILE:
case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_DIR:
if (virFileRemove(vol->target.path, vol->target.perms->uid, if (virFileRemove(vol->target.path, vol->target.perms->uid,
@ -2660,7 +2660,7 @@ storageBackendWipeLocal(const char *path,
} }
} }
VIR_DEBUG("wiping start: %zd len: %llu", (ssize_t) size, wipe_len); VIR_DEBUG("wiping start: %zd len: %llu", (ssize_t)size, wipe_len);
remaining = wipe_len; remaining = wipe_len;
while (remaining > 0) { while (remaining > 0) {
@ -2912,7 +2912,7 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool)
needs_create_as_uid = (def->type == VIR_STORAGE_POOL_NETFS); needs_create_as_uid = (def->type == VIR_STORAGE_POOL_NETFS);
mode = def->target.perms.mode; mode = def->target.perms.mode;
if (mode == (mode_t) -1 && if (mode == (mode_t)-1 &&
(needs_create_as_uid || !virFileExists(def->target.path))) (needs_create_as_uid || !virFileExists(def->target.path)))
mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE;
if (needs_create_as_uid) if (needs_create_as_uid)