2003-05-27 Marcus Brinkmann <marcus@g10code.de>

	* op-support.c (_gpgme_parse_inv_userid): Add missing break
	statements.
	* encrypt.c (gpgme_op_encrypt): Use gpgme_error_t instead of int.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index f2bf8b33b79d2107dad9d1a1ecda14c5f1504b30..133f970a011894fd8b6189eb6dbeb0e3008c34cd 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-27  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <marcus@g10code.de>
 
        * encrypt.c (gpgme_op_encrypt_result): Use intermediate variable

diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index 485158a40bdad97dbf4fc5ddbc188ed7032d7c1c..4873aaa51d7b021b92c87b88e6e3f09311d635f5 100644 (file)
--- 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 a81b4a6faa6c4a6f2cd4a0c3f40b7d2de21c2922..6a258b924b22bd87ef8140a759eb32a8986cb730 100644 (file)
--- 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 == ' ')