mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
8c48fbd0e2
commit
d68fe4f73d
3 changed files with 22 additions and 13 deletions
|
@ -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) );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue