From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 3 May 2013 09:47:24 +0000 (+0300)
Subject: Cosmetic fixes for comments and output
X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=commitdiff_plain;h=b54e273fec47af51792955143e84417b638ad2b7

Cosmetic fixes for comments and output
---

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index 2561c9a..e42ceb2 100644
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -141,7 +141,7 @@ void GetOpt::operator()(unsigned argc, const char *const *argv)
 	}
 
 	if(help)
-		throw usage_error(string("Help for ")+argv[0]+":", generate_help());
+		throw usage_error(string("Help for ")+argv[0]+":", "\nUsage:\n  "+generate_usage(argv[0])+"\n\n"+generate_help());
 }
 
 unsigned GetOpt::process_long(const char *const *argp)
diff --git a/source/core/getopt.h b/source/core/getopt.h
index f4e318e..411515f 100644
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -33,12 +33,12 @@ the string "-abc" could be interpreted as having the options 'a', 'b' and 'c'.
 If the option takes an argument and there are unused characters in the argv
 element, then those characters are interpreted as the argument.  Otherwise the
 next element is taken as the argument.  An optional argument must be given in
-the same element.
+the same element if it is given.
 
 Long options begin with a double dash and are identified by an arbitrary
 string.  An argument can be specified either in the same argv element,
 separated by an equals sign, or in the next element.  As with short options,
-an optional argument must be in the same element.
+an optional argument, if given, must be in the same element.
 
 A single option may have both alternative forms, but must always have at least
 a long form.  This is to encourage self-documenting options; it's much easier
@@ -220,9 +220,9 @@ public:
 
 	/** Adds an option with both short and long forms.  Processing depends on
 	the type of the destination variable and whether an argument is taken or
-	not.  With an argument, the value is lexical_cast to appropriate type and
-	stored in the destination.  Without an argument, a bool will be set to true
-	and an unsigned will be incremented; any other type will be ignored. */
+	not.  With an argument, the value is lexical_cast to the appropriate type
+	and stored in the destination.  Without an argument, a bool will be set to
+	true and an unsigned will be incremented; any other type will be ignored. */
 	template<typename T>
 	Option &add_option(char s, const std::string &l, T &d, ArgType a = NO_ARG)
 	{ return add_option(s, l, SimpleStore<T>(d), a); }