--- branches/development/src/applications/thermalizer/thermalizerCmd.c 2010/07/09 23:08:25 1465 +++ branches/development/src/applications/thermalizer/thermalizerCmd.c 2011/09/14 21:40:12 1630 @@ -1,7 +1,7 @@ /* - File autogenerated by gengetopt version 2.22 + File autogenerated by gengetopt version 2.22.4 generated with the following command: - gengetopt -u -F thermalizerCmd + gengetopt -F thermalizerCmd -u The developers of gengetopt consider the fixed text that goes in all gengetopt output files to be in the public domain: @@ -17,8 +17,12 @@ #include #include -#include "getopt.h" +#ifndef FIX_UNUSED +#define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */ +#endif +#include + #include "thermalizerCmd.h" const char *gengetopt_args_info_purpose = "Resamples the velocities for all the integrable objects in an OpenMD file from \na Maxwell-Boltzmann distribution."; @@ -46,7 +50,7 @@ static int void clear_args (struct gengetopt_args_info *args_info); static int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, +cmdline_parser_internal (int argc, char **argv, struct gengetopt_args_info *args_info, struct cmdline_parser_params *params, const char *additional_error); static int @@ -67,6 +71,7 @@ void clear_args (struct gengetopt_args_info *args_info static void clear_args (struct gengetopt_args_info *args_info) { + FIX_UNUSED (args_info); args_info->output_arg = NULL; args_info->output_orig = NULL; args_info->temperature_orig = NULL; @@ -88,7 +93,9 @@ cmdline_parser_print_version (void) void cmdline_parser_print_version (void) { - printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION); + printf ("%s %s\n", + (strlen(CMDLINE_PARSER_PACKAGE_NAME) ? CMDLINE_PARSER_PACKAGE_NAME : CMDLINE_PARSER_PACKAGE), + CMDLINE_PARSER_VERSION); } static void print_help_common(void) { @@ -103,7 +110,7 @@ static void print_help_common(void) { printf("\n"); if (strlen(gengetopt_args_info_description) > 0) - printf("%s\n", gengetopt_args_info_description); + printf("%s\n\n", gengetopt_args_info_description); } void @@ -122,7 +129,7 @@ cmdline_parser_init (struct gengetopt_args_info *args_ clear_args (args_info); init_args_info (args_info); - args_info->inputs = NULL; + args_info->inputs = 0; args_info->inputs_num = 0; } @@ -179,8 +186,9 @@ static void static void -write_into_file(FILE *outfile, const char *opt, const char *arg, char *values[]) +write_into_file(FILE *outfile, const char *opt, const char *arg, const char *values[]) { + FIX_UNUSED (values); if (arg) { fprintf(outfile, "%s=\"%s\"\n", opt, arg); } else { @@ -244,7 +252,7 @@ gengetopt_strdup (const char *s) char * gengetopt_strdup (const char *s) { - char *result = NULL; + char *result = 0; if (!s) return result; @@ -256,17 +264,17 @@ int } int -cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info) +cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info) { return cmdline_parser2 (argc, argv, args_info, 0, 1, 1); } int -cmdline_parser_ext (int argc, char * const *argv, struct gengetopt_args_info *args_info, +cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info *args_info, struct cmdline_parser_params *params) { int result; - result = cmdline_parser_internal (argc, argv, args_info, params, NULL); + result = cmdline_parser_internal (argc, argv, args_info, params, 0); if (result == EXIT_FAILURE) { @@ -278,7 +286,7 @@ int } int -cmdline_parser2 (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required) +cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required) { int result; struct cmdline_parser_params params; @@ -289,7 +297,7 @@ cmdline_parser2 (int argc, char * const *argv, struct params.check_ambiguity = 0; params.print_errors = 1; - result = cmdline_parser_internal (argc, argv, args_info, ¶ms, NULL); + result = cmdline_parser_internal (argc, argv, args_info, ¶ms, 0); if (result == EXIT_FAILURE) { @@ -305,7 +313,7 @@ cmdline_parser_required (struct gengetopt_args_info *a { int result = EXIT_SUCCESS; - if (cmdline_parser_required2(args_info, prog_name, NULL) > 0) + if (cmdline_parser_required2(args_info, prog_name, 0) > 0) result = EXIT_FAILURE; if (result == EXIT_FAILURE) @@ -321,6 +329,7 @@ cmdline_parser_required2 (struct gengetopt_args_info * cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error) { int error = 0; + FIX_UNUSED (additional_error); /* checks for required options */ if (! args_info->output_given) @@ -365,7 +374,8 @@ int update_arg(void *field, char **orig_field, static int update_arg(void *field, char **orig_field, unsigned int *field_given, unsigned int *prev_given, - char *value, char *possible_values[], const char *default_value, + char *value, const char *possible_values[], + const char *default_value, cmdline_parser_arg_type arg_type, int check_ambiguity, int override, int no_free, int multiple_option, @@ -376,6 +386,7 @@ int update_arg(void *field, char **orig_field, const char *val = value; int found; char **string_field; + FIX_UNUSED (field); stop_char = 0; found = 0; @@ -393,6 +404,7 @@ int update_arg(void *field, char **orig_field, return 1; /* failure */ } + FIX_UNUSED (default_value); if (field_given && *field_given && ! override) return 0; @@ -452,7 +464,8 @@ int int -cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info, +cmdline_parser_internal ( + int argc, char **argv, struct gengetopt_args_info *args_info, struct cmdline_parser_params *params, const char *additional_error) { int c; /* Character of the parsed option. */ @@ -491,7 +504,7 @@ cmdline_parser_internal (int argc, char * const *argv, { "version", 0, NULL, 'V' }, { "output", 1, NULL, 'o' }, { "temperature", 1, NULL, 't' }, - { NULL, 0, NULL, 0 } + { 0, 0, 0, 0 } }; c = getopt_long (argc, argv, "hVo:t:", long_options, &option_index);