diff options
| author | Marcus Brinkmann <[email protected]> | 2010-05-06 13:39:55 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2010-05-06 13:39:55 +0000 |
| commit | 749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5 (patch) | |
| tree | 5e43ee1064a9e68208c7ab288e08e89c814caa5f /src/gpgme-tool.c | |
| parent | 2010-04-19 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.tar.gz gpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.zip | |
2010-05-06 Marcus Brinkmann <[email protected]>
* configure.ac: Require libgpg-error 1.8.
src/
2010-05-06 Marcus Brinkmann <[email protected]>
* sign.c, data-user.c, conversion.c, debug.c, verify.c, data.c,
decrypt.c, delete.c, assuan-support.c, import.c, engine-gpgsm.c,
data-mem.c, op-support.c, w32-io.c, w32-util.c, data-compat.c: Use
gpg_error_from_syserror instead gpg_error_from_errno, and use
gpg_err_set_errno to set error number.
* setenv.c: Include <gpg-error.h> and define __set_errno to use
gpg_err_set_errno.
* gpgme-tool.c (ARGP_ERR_UNKNOWN): Define to EDEADLOCK (which is
mapped in Windows CE) instead of E2BIG (which is not).
(gt_import_keys): Initialize err.
Diffstat (limited to 'src/gpgme-tool.c')
| -rw-r--r-- | src/gpgme-tool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpgme-tool.c b/src/gpgme-tool.c index 57dcba38..26247590 100644 --- a/src/gpgme-tool.c +++ b/src/gpgme-tool.c @@ -107,7 +107,7 @@ struct argp_state void *pstate; }; -#define ARGP_ERR_UNKNOWN E2BIG +#define ARGP_ERR_UNKNOWN EDEADLOCK #define ARGP_KEY_ARG 0 #define ARGP_KEY_ARGS 0x1000006 #define ARGP_KEY_END 0x1000001 @@ -1651,7 +1651,7 @@ gt_genkey (gpgme_tool_t gt, const char *parms, gpgme_data_t public, gpg_error_t gt_import_keys (gpgme_tool_t gt, char *fpr[]) { - gpg_error_t err; + gpg_error_t err = 0; int cnt; int idx; gpgme_key_t *keys; |