diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-03-01 15:42:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-03-01 15:42:03 +0000 |
| commit | 979f3c10b98d84fcc54f7118ee63114a1016318b (patch) | |
| tree | c83b01e52ebc9144ed45d5b5685a6496d9695d5c | |
| parent | 789e260638d341ac6bcebf754ae494025cb8537d (diff) | |
| download | glib-979f3c10b98d84fcc54f7118ee63114a1016318b.tar.gz | |
More of the same
svn path=/trunk/; revision=7931
| -rw-r--r-- | gobject/ChangeLog | 1 | ||||
| -rw-r--r-- | gobject/glib-genmarshal.c | 24 |
2 files changed, 15 insertions, 10 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index b4c2587b2..f771f39fd 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -2,6 +2,7 @@ Bug 556706 – Inconsistent help arguments -h, -? + * glib-genmarshal.c: * glib-mkenums.in: Adjust help output, accept -?, capitalize. Patch by Christian Dywan diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index 78f5e1b83..f96f46634 100644 --- a/gobject/glib-genmarshal.c +++ b/gobject/glib-genmarshal.c @@ -814,6 +814,7 @@ parse_args (gint *argc_p, argv[i] = NULL; } else if (strcmp ("-h", argv[i]) == 0 || + strcmp ("-?", argv[i]) == 0 || strcmp ("--help", argv[i]) == 0) { print_blurb (stderr, TRUE); @@ -874,15 +875,18 @@ print_blurb (FILE *bout, } else { - g_fprintf (bout, "Usage: %s [options] [files...]\n", PRG_NAME); - g_fprintf (bout, " --header generate C headers\n"); - g_fprintf (bout, " --body generate C code\n"); - g_fprintf (bout, " --prefix=string specify marshaller prefix\n"); - g_fprintf (bout, " --skip-source skip source location comments\n"); - g_fprintf (bout, " --stdinc, --nostdinc include/use standard marshallers\n"); - g_fprintf (bout, " --internal mark generated functions as internal\n"); - g_fprintf (bout, " -h, --help show this help message\n"); - g_fprintf (bout, " -v, --version print version informations\n"); - g_fprintf (bout, " --g-fatal-warnings make warnings fatal (abort)\n"); + g_fprintf (bout, "Usage:\n"); + g_fprintf (bout, " %s [OPTION...] [FILES...]\n\n", PRG_NAME); + g_fprintf (bout, "Help Options:\n"); + g_fprintf (bout, " -h, --help Show this help message\n\n"); + g_fprintf (bout, "Utility Options:\n"); + g_fprintf (bout, " --header Generate C headers\n"); + g_fprintf (bout, " --body Generate C code\n"); + g_fprintf (bout, " --prefix=string Specify marshaller prefix\n"); + g_fprintf (bout, " --skip-source Skip source location comments\n"); + g_fprintf (bout, " --stdinc, --nostdinc Include/use standard marshallers\n"); + g_fprintf (bout, " --internal Mark generated functions as internal\n"); + g_fprintf (bout, " -v, --version Print version informations\n"); + g_fprintf (bout, " --g-fatal-warnings Make warnings fatal (abort)\n"); } } |