diff options
author | Werner Koch <[email protected]> | 2005-06-16 08:12:03 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2005-06-16 08:12:03 +0000 |
commit | deeba405a9a5868ea478db5003be6335ab9aac6f (patch) | |
tree | d61d720258fd571ec81a3d3e5d776320b7b1d796 /agent/query.c | |
parent | New debugging optionhs, updates to the manual. (diff) | |
download | gnupg-deeba405a9a5868ea478db5003be6335ab9aac6f.tar.gz gnupg-deeba405a9a5868ea478db5003be6335ab9aac6f.zip |
gcc-4 defaults forced me to edit many many files to get rid of the
char * vs. unsigned char * warnings. The GNU coding standards used to
say that these mismatches are okay and better than a bunch of casts.
Obviously this has changed now.
Diffstat (limited to 'agent/query.c')
-rw-r--r-- | agent/query.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/agent/query.c b/agent/query.c index c1e4dbacc..b231f6fc3 100644 --- a/agent/query.c +++ b/agent/query.c @@ -58,7 +58,7 @@ static pth_mutex_t entry_lock; struct entry_parm_s { int lines; size_t size; - char *buffer; + unsigned char *buffer; }; @@ -372,7 +372,7 @@ agent_askpin (ctrl_t ctrl, { memset (&parm, 0, sizeof parm); parm.size = pininfo->max_length; - parm.buffer = pininfo->pin; + parm.buffer = (unsigned char*)pininfo->pin; if (errtext) { @@ -444,7 +444,8 @@ agent_get_passphrase (CTRL ctrl, int rc; char line[ASSUAN_LINELENGTH]; struct entry_parm_s parm; - unsigned char *p, *hexstring; + unsigned char *p; + char *hexstring; int i; *retpass = NULL; @@ -497,7 +498,7 @@ agent_get_passphrase (CTRL ctrl, return unlock_pinentry (map_assuan_err (rc)); } - hexstring = gcry_malloc_secure (strlen (parm.buffer)*2+1); + hexstring = gcry_malloc_secure (strlen ((char*)parm.buffer)*2+1); if (!hexstring) { gpg_error_t tmperr = out_of_core (); |