X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=b3dc022e37f5ceaaca680f63a25173e46ba398d4;hp=c6af586df8cc4451413749664dd45630856d9bfa;hb=d1e6b28f66e243516d01916f9125baee75dd98d6;hpb=b01605d7062e4d1f005d5aaaaed158d8efe06d79

diff --git a/filter.c b/filter.c
index c6af586d..b3dc022e 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -47,16 +47,11 @@ INIT_STDERR_LOGGING(loglevel);
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? filter_args_info_detailed_help
-		: filter_args_info_help;
-
-	printf_or_die("%s\n\n", FILTER_CMDLINE_PARSER_PACKAGE "-"
-		FILTER_CMDLINE_PARSER_VERSION);
-	printf_or_die("%s\n\n", filter_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_filter_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(filter);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
 	exit(0);
 }
 
@@ -65,7 +60,7 @@ static int parse_config(void)
 	static char *cf; /* config file */
 	struct stat statbuf;
 
-	HANDLE_VERSION_FLAG("filter", conf);
+	version_handle_flag("filter", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
 	if (!cf) {