summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2014-06-16 12:38:14 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2014-06-17 13:42:45 +0200
commit7aef45f9bb8620e194d086ebeeaca0312e8aee04 (patch)
tree40647ebcc85a0d6fa16a0db18671b37c80ad8950
parent494db110040cdc88ebf60abee87b04c6c8718cea (diff)
downloadlvm2-7aef45f9bb8620e194d086ebeeaca0312e8aee04.tar.gz
cleanup: use stack for small buffer
Avoid error checking of allocation error when just few bytes are needed for short string and use stack. Stacktrace lvmetad_pv_gone() fail path.
-rw-r--r--tools/pvscan.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/tools/pvscan.c b/tools/pvscan.c
index ac43295ab..d161ba08a 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -164,18 +164,15 @@ out:
static int _clear_dev_from_lvmetad_cache(dev_t devno, int32_t major, int32_t minor,
activation_handler handler)
{
- char *buf;
+ char buf[24];
- if (dm_asprintf(&buf, "%" PRIi32 ":%" PRIi32, major, minor) < 0)
- stack;
- if (!lvmetad_pv_gone(devno, buf ? : "", handler)) {
- dm_free(buf);
- return 0;
- }
+ (void) dm_snprintf(buf, sizeof(buf), "%" PRIi32 ":%" PRIi32, major, minor);
+
+ if (!lvmetad_pv_gone(devno, buf, handler))
+ return_0;
log_print_unless_silent("Device %s not found. "
- "Cleared from lvmetad cache.", buf ? : "");
- dm_free(buf);
+ "Cleared from lvmetad cache.", buf);
return 1;
}