From: Guilherme Maciel Ferreira Date: Sat, 8 Oct 2011 14:21:01 +0000 (-0300) Subject: Using HostNameOption class to get the option name. X-Git-Tag: v1.3~11^2~34^2~4 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=c27095274ba6923c3a3c9926b576159a8223ae7c;p=pingcheck Using HostNameOption class to get the option name. --- diff --git a/src/config/configurationcommandline.cpp b/src/config/configurationcommandline.cpp index 92baf22..f958cd1 100644 --- a/src/config/configurationcommandline.cpp +++ b/src/config/configurationcommandline.cpp @@ -25,6 +25,7 @@ #include #include "config/configurationoptions.h" +#include "config/option/hostnameoption.h" using namespace std; using boost::program_options::command_line_parser; @@ -100,6 +101,7 @@ bool ConfigurationCommandLine::process( variables_map *vm ) try { ConfigurationOptions options; + HostNameOption host_name_option; options_description generic = options.get_generic_options(); options_description config = options.get_configuration_options(); @@ -108,7 +110,7 @@ bool ConfigurationCommandLine::process( variables_map *vm ) cmdline_options.add( generic ).add( config ); positional_options_description p; - (void) p.add( options.HostNameCmdStr.c_str(), -1 ); + (void) p.add( host_name_option.get_command_string().c_str(), -1 ); parsed_options parsed_opt = command_line_parser( argc, argv ). options( cmdline_options ). @@ -144,13 +146,12 @@ bool ConfigurationCommandLine::parse( ConfigurationOptions options; - // do not proceed if it is one of the halt options (i.e. version, help) + // Do not proceed if it is one of the halt options (i.e. --version, --help) bool halt = options.halt_on_generic_options( vm ); if ( halt ) { return false; } - bool generic_parsed = options.parse_generic_options( vm, configuration ); bool configuration_parsed = options.parse_configuration_options( vm, configuration );