diff options
| author | Werner Koch <wk@gnupg.org> | 2004-12-17 19:51:32 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2004-12-17 19:51:32 +0100 |
| commit | 74330a49ecaf8f191de2792fece7ab6fe6e26331 (patch) | |
| tree | e9b4159690e26dc2f8eae177b81b7e835dd1f4d9 /g10/passphrase.c | |
| parent | * configure.ac: Check for arpa/nameser.h. (diff) | |
| download | gnupg2-74330a49ecaf8f191de2792fece7ab6fe6e26331.tar.xz gnupg2-74330a49ecaf8f191de2792fece7ab6fe6e26331.zip | |
* passphrase.c (agent_get_passphrase): Define NREAD locally as
size_t or int.
* keylist.c (list_keyblock_print): Make field width an int.
* keyedit.c (show_key_with_all_names): Ditto.
Diffstat (limited to '')
| -rw-r--r-- | g10/passphrase.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index 594fa335b..1a477288d 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -643,7 +643,6 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text, char *atext = NULL; char buf[50]; int fd = -1; - int nread; u32 reply; char *pw = NULL; PKT_public_key *pk = m_alloc_clear( sizeof *pk ); @@ -742,6 +741,8 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text, if (!prot) { /* old style protocol */ + size_t nread; + n = 4 + 20 + strlen (atext); u32tobuf (buf, n ); u32tobuf (buf+4, GPGA_PROT_GET_PASSPHRASE ); @@ -814,6 +815,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text, } else { /* The new Assuan protocol */ + int nread; char *line, *p; const unsigned char *s; int i; |