diff options
author | Alasdair Kergon <agk@redhat.com> | 2006-05-09 21:23:51 +0000 |
---|---|---|
committer | Alasdair Kergon <agk@redhat.com> | 2006-05-09 21:23:51 +0000 |
commit | 72b2cb613a57918dadf9722c59a30ca71d751c8e (patch) | |
tree | ae0130e37b873591370abd65ff44cb2a554db049 /tools/lvmdiskscan.c | |
parent | b810c547004a98a7fc25c8dde65cf88d82ad9652 (diff) | |
download | lvm2-72b2cb613a57918dadf9722c59a30ca71d751c8e.tar.gz lvm2-72b2cb613a57918dadf9722c59a30ca71d751c8e.tar.xz lvm2-72b2cb613a57918dadf9722c59a30ca71d751c8e.zip |
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.
Diffstat (limited to 'tools/lvmdiskscan.c')
-rw-r--r-- | tools/lvmdiskscan.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |