diff options
| author | Karel Zak | 2019-04-16 13:47:17 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-04-16 13:47:17 +0200 |
| commit | 68224d108d1e5359a111cb2be0404f6556cb90dd (patch) | |
| tree | 4d956d4d580dd6ceac9e7a23469a914780d115ac /disk-utils | |
| parent | include/closestream: add close_stdout_atexit() (diff) | |
| download | kernel-qcow2-util-linux-68224d108d1e5359a111cb2be0404f6556cb90dd.tar.gz kernel-qcow2-util-linux-68224d108d1e5359a111cb2be0404f6556cb90dd.tar.xz kernel-qcow2-util-linux-68224d108d1e5359a111cb2be0404f6556cb90dd.zip | |
include/c: add print_version() macro
Let's consolidate the version printing code. It also seems better to
use exit() after --version, because it's handled in different way by
ASAN.
It's strange, but ASAN reports leaks after return in main(). Note that
we do not use free-before-exit.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/mkfs.bfs.c | 10 | ||||
| -rw-r--r-- | disk-utils/mkfs.c | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c index 5bf8fdfd8..77f253f1e 100644 --- a/disk-utils/mkfs.bfs.c +++ b/disk-utils/mkfs.bfs.c @@ -91,12 +91,6 @@ static void __attribute__((__noreturn__)) usage(void) exit(EXIT_SUCCESS); } -static void __attribute__ ((__noreturn__)) print_version(void) -{ - printf(UTIL_LINUX_VERSION); - exit(EXIT_SUCCESS); -} - int main(int argc, char **argv) { char *device, *volume, *fsname; @@ -134,7 +128,7 @@ int main(int argc, char **argv) errtryhelp(EXIT_FAILURE); } if (argc == 2 && !strcmp(argv[1], "-V")) - print_version(); + print_version(EXIT_SUCCESS); volume = fsname = " "; /* is there a default? */ inodes = 0; @@ -169,7 +163,7 @@ int main(int argc, char **argv) break; case VERSION_OPTION: - print_version(); + print_version(EXIT_SUCCESS); case 'h': usage(); default: diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 5bcd9613c..fbd575e7e 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -61,12 +61,6 @@ static void __attribute__((__noreturn__)) usage(void) exit(EXIT_SUCCESS); } -static void __attribute__ ((__noreturn__)) print_version(void) -{ - printf(UTIL_LINUX_VERSION); - exit(EXIT_SUCCESS); -} - int main(int argc, char **argv) { char *progname; /* name of executable to be called */ @@ -89,7 +83,7 @@ int main(int argc, char **argv) atexit(close_stdout); if (argc == 2 && !strcmp(argv[1], "-V")) - print_version(); + print_version(EXIT_SUCCESS); /* Check commandline options. */ opterr = 0; @@ -106,7 +100,7 @@ int main(int argc, char **argv) case 'h': usage(); case VERSION_OPTION: - print_version(); + print_version(EXIT_SUCCESS); default: optind--; more = 1; |