From: Peter Rajnoha Date: Tue, 31 May 2016 07:39:06 +0000 (+0200) Subject: coverity: blkdeactivate: separate format and args for printf and declare and assign... X-Git-Tag: v2_02_155~13 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5b3a4a9;p=lvm2.git coverity: blkdeactivate: separate format and args for printf and declare and assign separately to avoid masking return values --- diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in index 39b0f2cb0..2a48b3e0f 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in @@ -147,7 +147,7 @@ device_umount_one() { if test -z "${SKIP_UMOUNT_LIST["$mnt"]}" -a "$DO_UMOUNT" -eq "1"; then echo -n " [UMOUNT]: unmounting $name ($kname) mounted on $mnt... " - if eval $UMOUNT $UMOUNT_OPTS "$(printf $mnt)" $OUT $ERR; then + if eval $UMOUNT $UMOUNT_OPTS "$(printf "%s" "$mnt")" $OUT $ERR; then echo "done" else echo "skipping" @@ -193,7 +193,8 @@ deactivate_holders () { } deactivate_dm () { - local name=$(printf $name) + local name + name=$(printf "%s" "$name") test -b "$DEV_DIR/mapper/$name" || return 0 test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1 @@ -262,7 +263,8 @@ deactivate_lvm () { } deactivate_md () { - local name=$(printf $name) + local name + name=$(printf "%s" "$name") test -b "$DEV_DIR/$name" || return 0 test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1