2003-07-29 Marcus Brinkmann <marcus@g10code.de>

	* decrypt-verify.c (decrypt_verify_status_handler): Expand silly
	and wrong expression.
	* encrypt-sign.c (encrypt_sign_status_handler): Likewise.
	* encrypt.c (encrypt_sym_status_handler): Likewise.
	* sign.c (sign_status_handler): Likewise.
	* verify.c (verify_status_handler): Likewise.
	* decrypt.c (decrypt_status_handler): Likewise.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 3f10f0d85bc3ccdcfa1d2dc7a9187221d02eeab8..6e53a7232c5cd248abdeb2ee14c8ff6fcfc845d7 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-29  Marcus Brinkmann  <marcus@g10code.de>
 
+       * decrypt-verify.c (decrypt_verify_status_handler): Expand silly
+       and wrong expression.
+       * encrypt-sign.c (encrypt_sign_status_handler): Likewise.
+       * encrypt.c (encrypt_sym_status_handler): Likewise.
+       * sign.c (sign_status_handler): Likewise.
+       * verify.c (verify_status_handler): Likewise.
+       * decrypt.c (decrypt_status_handler): Likewise.
+
        * engine.c (gpgme_get_engine_info): Initialize NULL.
 
 2003-07-23  Marcus Brinkmann  <marcus@g10code.de>

diff --git a/trunk/gpgme/decrypt-verify.c b/trunk/gpgme/decrypt-verify.c
index 916cda6884bcb94135e7567c7dea3c11527500c9..40818bfb0bfa639204445577b61096b8d5999660 100644 (file)
--- a/trunk/gpgme/decrypt-verify.c
+++ b/trunk/gpgme/decrypt-verify.c
@@ -30,9 +30,14 @@ static gpgme_error_t
 decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
                               char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_decrypt_status_handler (priv, code, args)
-    || _gpgme_verify_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_decrypt_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_verify_status_handler (priv, code, args);
+  return err;
 }
 
 

diff --git a/trunk/gpgme/decrypt.c b/trunk/gpgme/decrypt.c
index e503b2666d02c14949104f254841a0f5f520c5b0..030073faa13459e4d6a10ffd94661e3bc374bb48 100644 (file)
--- a/trunk/gpgme/decrypt.c
+++ b/trunk/gpgme/decrypt.c
@@ -147,8 +147,12 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
 static gpgme_error_t
 decrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_decrypt_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_decrypt_status_handler (priv, code, args);
+  return err;
 }
 
 

diff --git a/trunk/gpgme/encrypt-sign.c b/trunk/gpgme/encrypt-sign.c
index 8afb1f16e8cd6da3ec965bceace6accdd273ab43..ae4b594abd04d0e97160c7d79a5cc22758e9add3 100644 (file)
--- a/trunk/gpgme/encrypt-sign.c
+++ b/trunk/gpgme/encrypt-sign.c
@@ -30,9 +30,14 @@
 static gpgme_error_t
 encrypt_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_encrypt_status_handler (priv, code, args)
-    || _gpgme_sign_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_encrypt_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_sign_status_handler (priv, code, args);
+  return err;
 }
 
 

diff --git a/trunk/gpgme/encrypt.c b/trunk/gpgme/encrypt.c
index 61619ed943de9be144316638288e5b814afea51b..6eb177e0d289f846c0db6960cd50158bde154671 100644 (file)
--- a/trunk/gpgme/encrypt.c
+++ b/trunk/gpgme/encrypt.c
@@ -117,8 +117,12 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
 static gpgme_error_t
 encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_passphrase_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_passphrase_status_handler (priv, code, args);
+  return err;
 }
 
 

diff --git a/trunk/gpgme/sign.c b/trunk/gpgme/sign.c
index af0078907e89e5aea81c4ae1102da5f9053468b5..0f2c4ee371c40ba0e0dc6c41f4b9af0b32b3abcc 100644 (file)
--- a/trunk/gpgme/sign.c
+++ b/trunk/gpgme/sign.c
@@ -236,8 +236,12 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_sign_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_sign_status_handler (priv, code, args);
+  return err;
 }
 
 

diff --git a/trunk/gpgme/verify.c b/trunk/gpgme/verify.c
index 105d1c41211fcc8195d5c7ba942cd94760b6ca56..43190f64093fe993bc37d3531001729958a9fe9a 100644 (file)
--- a/trunk/gpgme/verify.c
+++ b/trunk/gpgme/verify.c
@@ -532,8 +532,12 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_verify_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_verify_status_handler (priv, code, args);
+  return err;
 }