summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Rajnoha <prajnoha@redhat.com>2016-05-31 09:39:06 +0200
committerPeter Rajnoha <prajnoha@redhat.com>2016-05-31 09:39:06 +0200
commit5b3a4a95956fe467a2c5fe1cce3925e67366d4fe (patch)
tree783ce3cb3ee0b48a330fb91dea467d2735d6bea6
parent02d67848eb994c19c6ff2050196585fb763c83cb (diff)
downloadlvm2-5b3a4a95956fe467a2c5fe1cce3925e67366d4fe.tar.gz
coverity: blkdeactivate: separate format and args for printf and declare and assign separately to avoid masking return values
-rw-r--r--scripts/blkdeactivate.sh.in8
1 files changed, 5 insertions, 3 deletions
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