diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-23 14:59:05 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-23 14:59:05 +0900 |
| commit | 295a62f538df8115d932f09e69e2950484e038c0 (patch) | |
| tree | db32d5a6600e58716e646ac1d5b1573e0e02d531 /src/option_processing.cc | |
| parent | 461a542c5e236a22bb4edba3fae9610df4ba44c6 (diff) | |
Rewritten help tags and various internal flag handling in OptionHandler
Now help tags are defined as enum values to avoid vector of strings.
The internal flags are represented by bitmask to shrink size.
Diffstat (limited to 'src/option_processing.cc')
| -rw-r--r-- | src/option_processing.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/option_processing.cc b/src/option_processing.cc index c1c6d065..66be040e 100644 --- a/src/option_processing.cc +++ b/src/option_processing.cc @@ -198,7 +198,7 @@ void option_processing(Option& op, std::vector<std::string>& uris, if(op.defined(PREF_HELP)) { std::string keyword; if(op.get(PREF_HELP).empty()) { - keyword = TAG_BASIC; + keyword = strHelpTag(TAG_BASIC); } else { keyword = op.get(PREF_HELP); if(util::startsWith(keyword, "--")) { @@ -217,7 +217,7 @@ void option_processing(Option& op, std::vector<std::string>& uris, oparser->parseDefaultValues(op); if(!noConf) { - std::string cfname = + std::string cfname = ucfname.empty() ? oparser->find(PREF_CONF_PATH)->getDefaultValue() : ucfname; @@ -249,7 +249,7 @@ void option_processing(Option& op, std::vector<std::string>& uris, global::cerr()->printf(_("Configuration file %s is not found."), cfname.c_str()); global::cerr()->printf("\n"); - showUsage(TAG_HELP, oparser, global::cerr()); + showUsage(strHelpTag(TAG_HELP), oparser, global::cerr()); exit(error_code::UNKNOWN_ERROR); } } |