diff options
| author | Marcus Brinkmann <[email protected]> | 2003-05-27 08:18:04 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-05-27 08:18:04 +0000 |
| commit | 78c70247f0a9230ce5063bddc8002cf10c427d5d (patch) | |
| tree | 13c7dc71dcc7da85fdc93d4f1e0ea411bd78e3e9 | |
| parent | Fix last change. (diff) | |
| download | gpgme-78c70247f0a9230ce5063bddc8002cf10c427d5d.tar.gz gpgme-78c70247f0a9230ce5063bddc8002cf10c427d5d.zip | |
2003-05-27 Marcus Brinkmann <[email protected]>
* op-support.c (_gpgme_parse_inv_userid): Add missing break
statements.
* encrypt.c (gpgme_op_encrypt): Use gpgme_error_t instead of int.
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/encrypt.c | 2 | ||||
| -rw-r--r-- | gpgme/op-support.c | 11 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index f2bf8b33..133f970a 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,11 @@ 2003-05-27 Marcus Brinkmann <[email protected]> + * op-support.c (_gpgme_parse_inv_userid): Add missing break + statements. + * encrypt.c (gpgme_op_encrypt): Use gpgme_error_t instead of int. + +2003-05-27 Marcus Brinkmann <[email protected]> + * encrypt.c (gpgme_op_encrypt_result): Use intermediate variable HOOK to avoid compiler warning. Don't ask, you don't want to know. (_gpgme_encrypt_status_handler): Likewise. diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c index 485158a4..4873aaa5 100644 --- a/gpgme/encrypt.c +++ b/gpgme/encrypt.c @@ -206,7 +206,7 @@ gpgme_error_t gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_recipients_t recp, gpgme_data_t plain, gpgme_data_t cipher) { - int err = encrypt_start (ctx, 1, recp, plain, cipher); + gpgme_error_t err = encrypt_start (ctx, 1, recp, plain, cipher); if (!err) err = _gpgme_wait_one (ctx); return err; diff --git a/gpgme/op-support.c b/gpgme/op-support.c index a81b4a6f..6a258b92 100644 --- a/gpgme/op-support.c +++ b/gpgme/op-support.c @@ -134,36 +134,47 @@ _gpgme_parse_inv_userid (char *args, gpgme_invalid_user_id_t *userid) default: case 0: inv_userid->reason = GPGME_Unknown_Reason; + break; case 1: inv_userid->reason = GPGME_Not_Found; + break; case 2: inv_userid->reason = GPGME_Ambiguous_Specification; + break; case 3: inv_userid->reason = GPGME_Wrong_Key_Usage; + break; case 4: inv_userid->reason = GPGME_Key_Revoked; + break; case 5: inv_userid->reason = GPGME_Key_Expired; + break; case 6: inv_userid->reason = GPGME_No_CRL_Known; + break; case 7: inv_userid->reason = GPGME_CRL_Too_Old; + break; case 8: inv_userid->reason = GPGME_Policy_Mismatch; + break; case 9: inv_userid->reason = GPGME_No_Secret_Key; + break; case 10: inv_userid->reason = GPGME_Key_Not_Trusted; + break; } while (*tail == ' ') |