fixed deprecated functions in gengetopt cmdline parser

1 files changed, 17 insertions, 3 deletions

diff --git a/tests/daemon/testd.c b/tests/daemon/testd.c
index 76ac858..6bd3a0a 100644
--- a/tests/daemon/testd.c
+++ b/tests/daemon/testd.c
@@ -28,9 +28,16 @@
 #define DEFAULT_CONFIG_FILE "/etc/" CMDLINE_PARSER_PACKAGE ".conf"
 
 static int parse_options_and_arguments( int argc, char *argv[], struct gengetopt_args_info *args_info ) {
+	struct cmdline_parser_params params;
+
+	cmdline_parser_params_init( &params );
+	params.override = 1;
+	params.initialize = 0;
+	params.check_required = 1;
+
         cmdline_parser_init( args_info );
 
-        if( cmdline_parser2( argc, argv, args_info, 1, 0, 1 ) != 0 ) {
+        if( cmdline_parser_ext( argc, argv, args_info, &params ) != 0 ) {
         	cmdline_parser_free( args_info );
         	return EXIT_FAILURE;
         }
@@ -46,7 +53,14 @@ static int test_config( const char *filename ) {
 
 static int read_config( const char *filename, struct gengetopt_args_info *args_info ) {
 	char *config_filename = strdup( filename );
-	if( cmdline_parser_configfile( config_filename, args_info, 1, 0, 1 ) != 0 ) {
+	struct cmdline_parser_params params;
+
+	cmdline_parser_params_init( &params );
+	params.override = 1;
+	params.initialize = 0;
+	params.check_required = 1;
+
+	if( cmdline_parser_config_file( config_filename, args_info, &params ) != 0 ) {
 		/* TODO: gengetopt must support i18n for this */
 		fprintf( stderr, "\n%s\n", gengetopt_args_info_usage );
 		cmdline_parser_free( args_info );
@@ -62,7 +76,7 @@ static int read_config( const char *filename, struct gengetopt_args_info *args_i
  *        set it in platform.mk?
  */
 //#define LOCALEDIR "/usr/share/locale"
-#define LOCALEDIR "lcoale"
+#define LOCALEDIR "locale"
 
 int main( int argc, char *argv[] ) {
 	struct gengetopt_args_info args_info;