misc: cosmetics, remove argument from usage(FILE*)

[thirdparty/util-linux.git] / misc-utils / uuidgen.c

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 219be8b623ba007500fe14d8f4144e860f647805..77fda2fb3b5904de7996b85a2eedb92bd1b3e241 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -10,38 +10,32 @@
  */
 
 #include <stdio.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-extern int getopt(int argc, char * const argv[], const char *optstring);
-extern char *optarg;
-extern int optind;
-#endif
 
 #include "uuid.h"
 #include "nls.h"
 #include "c.h"
 #include "closestream.h"
 
-#define DO_TYPE_TIME   1
-#define DO_TYPE_RANDOM 2
-
-static void __attribute__ ((__noreturn__)) usage(FILE * out)
+static void __attribute__((__noreturn__)) usage(void)
 {
-       fputs(_("\nUsage:\n"), out);
+       FILE *out = stdout;
+       fputs(USAGE_HEADER, out);
        fprintf(out,
              _(" %s [options]\n"), program_invocation_short_name);
 
-       fputs(_("\nOptions:\n"), out);
-       fputs(_(" -r, --random     generate random-based uuid\n"
-               " -t, --time       generate time-based uuid\n"
-               " -V, --version    output version information and exit\n"
-               " -h, --help       display this help and exit\n\n"), out);
+       fputs(USAGE_SEPARATOR, out);
+       fputs(_("Create a new UUID value.\n"), out);
 
-       exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+       fputs(USAGE_OPTIONS, out);
+       fputs(_(" -r, --random     generate random-based uuid\n"), out);
+       fputs(_(" -t, --time       generate time-based uuid\n"), out);
+       fputs(USAGE_SEPARATOR, out);
+       fputs(USAGE_HELP, out);
+       fputs(USAGE_VERSION, out);
+       fprintf(out, USAGE_MAN_TAIL("uuidgen(1)"));
+       exit(EXIT_SUCCESS);
 }
 
 int
@@ -53,7 +47,7 @@ main (int argc, char *argv[])
        uuid_t uu;
 
        static const struct option longopts[] = {
-               {"random", required_argument, NULL, 'r'},
+               {"random", no_argument, NULL, 'r'},
                {"time", no_argument, NULL, 't'},
                {"version", no_argument, NULL, 'V'},
                {"help", no_argument, NULL, 'h'},
@@ -68,27 +62,25 @@ main (int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "rtVh", longopts, NULL)) != -1)
                switch (c) {
                case 't':
-                       do_type = DO_TYPE_TIME;
+                       do_type = UUID_TYPE_DCE_TIME;
                        break;
                case 'r':
-                       do_type = DO_TYPE_RANDOM;
+                       do_type = UUID_TYPE_DCE_RANDOM;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                               program_invocation_short_name,
-                               PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
-                       usage(stdout);
+                       usage();
                default:
-                       usage(stderr);
+                       errtryhelp(EXIT_FAILURE);
                }
 
        switch (do_type) {
-       case DO_TYPE_TIME:
+       case UUID_TYPE_DCE_TIME:
                uuid_generate_time(uu);
                break;
-       case DO_TYPE_RANDOM:
+       case UUID_TYPE_DCE_RANDOM:
                uuid_generate_random(uu);
                break;
        default: