diff options
| author | Werner Koch <[email protected]> | 2002-10-04 05:43:54 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-10-04 05:43:54 +0000 |
| commit | d68fe4f73d00cf13dddfd18bf08d4aded176fdad (patch) | |
| tree | 84040ac7ab4d9fce578e09fe7396fb44a3579302 /g10/import.c | |
| parent | * options.h, g10.c (main): Add --strict and --no-strict to switch the (diff) | |
| download | gnupg-d68fe4f73d00cf13dddfd18bf08d4aded176fdad.tar.gz gnupg-d68fe4f73d00cf13dddfd18bf08d4aded176fdad.zip | |
* import.c (import_keys_internal): s/inp/inp2/ to avoid shadowing
warning.
* passphrase.c (agent_get_passphrase): Fixed signed/unsigned char
problem in %-escaping. Noted by Ingo Kl�cker.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/import.c b/g10/import.c index 9f6b8936e..30ac913e2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -193,14 +193,14 @@ import_keys_internal( IOBUF inp, char **fnames, int nnames, for(i=0; i < nnames; i++ ) { const char *fname = fnames? fnames[i] : NULL; - IOBUF inp = iobuf_open(fname); + IOBUF inp2 = iobuf_open(fname); if( !fname ) fname = "[stdin]"; if( !inp ) log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); else { - rc = import( inp, fname, stats, options ); - iobuf_close(inp); + rc = import( inp2, fname, stats, options ); + iobuf_close(inp2); if( rc ) log_error("import from `%s' failed: %s\n", fname, g10_errstr(rc) ); |