From 2c308875a7fa1aaa44892c368f6b37bcfcb8879a Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Tue, 16 Apr 2019 15:14:13 +0200
Subject: misc: consolidate version printing and close_stdout()

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 sys-utils/chmem.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'sys-utils/chmem.c')

diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c
index 861f6cfd2..b3645be19 100644
--- a/sys-utils/chmem.c
+++ b/sys-utils/chmem.c
@@ -379,7 +379,7 @@ int main(int argc, char **argv)
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
-	atexit(close_stdout);
+	close_stdout_atexit();
 
 	ul_path_init_debug();
 	desc->sysmem = ul_new_path(_PATH_SYS_MEMORY);
@@ -402,18 +402,17 @@ int main(int argc, char **argv)
 		case 'b':
 			desc->use_blocks = 1;
 			break;
-		case 'h':
-			usage();
-			break;
 		case 'v':
 			desc->verbose = 1;
 			break;
-		case 'V':
-			printf(UTIL_LINUX_VERSION);
-			return EXIT_SUCCESS;
 		case 'z':
 			zone = xstrdup(optarg);
 			break;
+
+		case 'h':
+			usage();
+		case 'V':
+			print_version(EXIT_SUCCESS);
 		default:
 			errtryhelp(EXIT_FAILURE);
 		}
-- 
cgit v1.2.3-55-g7522