From 72b2cb613a57918dadf9722c59a30ca71d751c8e Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 9 May 2006 21:23:51 +0000 Subject: Make SIZE_SHORT the default for display_size(). Fix some memory leaks in error paths found by coverity. Use C99 struct initialisers. Move DEFS into configure.h. Clean-ups to remove miscellaneous compiler warnings. --- tools/lvmdiskscan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/lvmdiskscan.c') diff --git a/tools/lvmdiskscan.c b/tools/lvmdiskscan.c index 1d11efa7..087215d7 100644 --- a/tools/lvmdiskscan.c +++ b/tools/lvmdiskscan.c @@ -64,7 +64,7 @@ static void _print(struct cmd_context *cmd, const struct device *dev, uint64_t size, const char *what) { log_print("%-*s [%15s] %s", max_len, dev_name(dev), - display_size(cmd, size, SIZE_SHORT), what ? : ""); + display_size(cmd, size), what ? : ""); } static int _check_device(struct cmd_context *cmd, struct device *dev) @@ -91,7 +91,8 @@ static int _check_device(struct cmd_context *cmd, struct device *dev) return 1; } -int lvmdiskscan(struct cmd_context *cmd, int argc, char **argv) +int lvmdiskscan(struct cmd_context *cmd, int argc __attribute((unused)), + char **argv __attribute((unused))) { uint64_t size; struct dev_iter *iter; -- cgit