32 lines
756 B
Diff
32 lines
756 B
Diff
--- gpgme/keylist.c
|
|
+++ gpgme/keylist.c
|
|
@@ -382,7 +382,7 @@
|
|
void *hook;
|
|
op_data_t opd;
|
|
gpgme_error_t err;
|
|
- gpgme_key_t key;
|
|
+ gpgme_key_t key = NULL;
|
|
gpgme_subkey_t subkey = NULL;
|
|
gpgme_key_sig_t keysig = NULL;
|
|
|
|
rungpg.c: In function 'gpg_new':
|
|
rungpg.c:489: warning: the address of 'dft_ttyname' will always evaluate as 'true'
|
|
|
|
--- gpgme/rungpg.c
|
|
+++ gpgme/rungpg.c
|
|
@@ -486,14 +486,9 @@
|
|
rc = gpg_error_from_errno (errno);
|
|
else
|
|
{
|
|
- if (dft_ttyname)
|
|
- {
|
|
rc = add_arg (gpg, "--ttyname");
|
|
if (!rc)
|
|
rc = add_arg (gpg, dft_ttyname);
|
|
- }
|
|
- else
|
|
- rc = 0;
|
|
if (!rc)
|
|
{
|
|
rc = _gpgme_getenv ("TERM", &dft_ttytype);
|