From 327580ff6bf365178cfb1b1869606f506481ba3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 23 Sep 2020 18:53:29 +0200 Subject: [PATCH] storage: createFileDir: use less ternary operators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce separate variables and if conditions with spaces around them to make the function call easier to read. Signed-off-by: Ján Tomko Reviewed-by: Martin Kletzander --- src/storage/storage_util.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7bcc0ee832..94f62515f2 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1997,6 +1997,8 @@ createFileDir(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); + mode_t permmode = VIR_STORAGE_DEFAULT_VOL_PERM_MODE; + unsigned int createflags = 0; virCheckFlags(0, -1); @@ -2013,15 +2015,17 @@ createFileDir(virStoragePoolObjPtr pool, return -1; } + if (vol->target.perms->mode != (mode_t)-1) + permmode = vol->target.perms->mode; + + if (def->type == VIR_STORAGE_POOL_NETFS) + createflags |= VIR_DIR_CREATE_AS_UID; if (virDirCreate(vol->target.path, - (vol->target.perms->mode == (mode_t)-1 ? - VIR_STORAGE_DEFAULT_VOL_PERM_MODE : - vol->target.perms->mode), + permmode, vol->target.perms->uid, vol->target.perms->gid, - (def->type == VIR_STORAGE_POOL_NETFS - ? VIR_DIR_CREATE_AS_UID : 0)) < 0) { + createflags) < 0) { return -1; }