bash-completion: update options before release

[thirdparty/util-linux.git] / disk-utils / fdformat.c

diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index f84b847338023be7bb27c7afcfbc298d4f90f4dc..c10776f76eac785cf43bd0e2025a1a01a7ceb90b 100644 (file)
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -156,8 +156,8 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -n, --no-verify   disable the verification after the format\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
-       print_usage_help_options(19);
-       fprintf(out, USAGE_MAN_TAIL("fdformat(8)"));
+       printf(USAGE_HELP_OPTIONS(19));
+       printf(USAGE_MAN_TAIL("fdformat(8)"));
 
        exit(EXIT_SUCCESS);
 }
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "f:t:r:nVh", longopts, NULL)) != -1)
                switch (ch) {
@@ -204,8 +204,7 @@ int main(int argc, char **argv)
                        verify = 0;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default: