security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-14 18:31:03 +02:00
Code Activity

* argparse.c (initialize): Avoid a number of -Wformat-nonliteral warnings.

Browse Source 
These aren't actual problems, but the warnings bothered me.
This commit is contained in:
David Shaw 2004-01-13 22:35:40 +00:00
parent b644894902
commit 2a23fe9019
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/ChangeLog
View File

@ -1,3 +1,9 @@
2004-01-13 David Shaw <dshaw@localhost.localdomain>
* argparse.c (initialize): Avoid a number of -Wformat-nonliteral
warnings. These aren't actual problems, but the warnings bothered
me.
2004-01-13 David Shaw <dshaw@jabberwocky.com> 2004-01-13 David Shaw <dshaw@jabberwocky.com>
* miscutil.c (print_string2): New variation on print_string that * miscutil.c (print_string2): New variation on print_string that

35
util/argparse.c
View File

@ -159,39 +159,42 @@ initialize( ARGPARSE_ARGS *arg, const char *filename, unsigned *lineno )
if( arg->err ) { /* last option was erroneous */ if( arg->err ) { /* last option was erroneous */
const char *s;
if( filename ) { if( filename ) {
if( arg->r_opt == -6 ) if( arg->r_opt == -6 )
s = "%s:%u: argument not expected\n"; log_error("%s:%u: argument not expected\n", filename, *lineno );
else if( arg->r_opt == -5 ) else if( arg->r_opt == -5 )
s = "%s:%u: read error\n"; log_error("%s:%u: read error\n", filename, *lineno );
else if( arg->r_opt == -4 ) else if( arg->r_opt == -4 )
s = "%s:%u: keyword too long\n"; log_error("%s:%u: keyword too long\n", filename, *lineno );
else if( arg->r_opt == -3 ) else if( arg->r_opt == -3 )
s = "%s:%u: missing argument\n"; log_error("%s:%u: missing argument\n", filename, *lineno );
else if( arg->r_opt == -7 ) else if( arg->r_opt == -7 )
s = "%s:%u: invalid command\n"; log_error("%s:%u: invalid command\n", filename, *lineno );
else if( arg->r_opt == -10 ) else if( arg->r_opt == -10 )
s = "%s:%u: invalid alias definition\n"; log_error("%s:%u: invalid alias definition\n",filename,*lineno);
else else
s = "%s:%u: invalid option\n"; log_error("%s:%u: invalid option\n", filename, *lineno );
log_error(s, filename, *lineno );
} }
else { else {
if( arg->r_opt == -3 ) if( arg->r_opt == -3 )
s = "Missing argument for option \"%.50s\"\n"; log_error("Missing argument for option \"%.50s\"\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -6 ) else if( arg->r_opt == -6 )
s = "Option \"%.50s\" does not expect an argument\n"; log_error("Option \"%.50s\" does not expect an argument\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -7 ) else if( arg->r_opt == -7 )
s = "Invalid command \"%.50s\"\n"; log_error("Invalid command \"%.50s\"\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -8 ) else if( arg->r_opt == -8 )
s = "Option \"%.50s\" is ambiguous\n"; log_error("Option \"%.50s\" is ambiguous\n",
arg->internal.last? arg->internal.last:"[??]" );
else if( arg->r_opt == -9 ) else if( arg->r_opt == -9 )
s = "Command \"%.50s\" is ambiguous\n"; log_error("Command \"%.50s\" is ambiguous\n",
arg->internal.last? arg->internal.last:"[??]" );
else else
s = "Invalid option \"%.50s\"\n"; log_error("Invalid option \"%.50s\"\n",
log_error(s, arg->internal.last? arg->internal.last:"[??]" ); arg->internal.last? arg->internal.last:"[??]" );
} }
if( arg->err != 1 || arg->r_opt == -5 ) if( arg->err != 1 || arg->r_opt == -5 )
exit(2); exit(2);