2009-10-28 Marcus Brinkmann <marcus@g10code.de>

	* signers.c, encrypt-sign.c, encrypt.c, delete.c, keylist.c,
	edit.c, import.c, export.c: Fix last change in debug output.

diff --git a/src/ChangeLog b/src/ChangeLog
index e50d8119a1e9c2987093976cf4e383912a7c8874..196be97c7ce01cfbe9cbad1b3d96b108a3cb62f8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-28  Marcus Brinkmann  <marcus@g10code.de>
+
+       * signers.c, encrypt-sign.c, encrypt.c, delete.c, keylist.c,
+       edit.c, import.c, export.c: Fix last change in debug output.
+
 2009-10-27  Marcus Brinkmann  <marcus@g10code.de>
 
        * edit.c (gpgme_op_edit_start, gpgme_op_edit)

diff --git a/src/delete.c b/src/delete.c
index 1fd5bd8e08e94a3897e9a257b4582fb21d12c73a..bfb980a3ac41555249af35e9b94898e43459ac3b 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -96,7 +96,7 @@ gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key,
 {
   TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx,
              "key=%p (%s), allow_secret=%i", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", allow_secret);
   return TRACE_ERR (delete_start (ctx, 0, key, allow_secret));
 }
@@ -111,7 +111,7 @@ gpgme_op_delete (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret)
 
   TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx,
              "key=%p (%s), allow_secret=%i", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", allow_secret);
   err = delete_start (ctx, 1, key, allow_secret);
   if (!err)

diff --git a/src/edit.c b/src/edit.c
index edf20894ed9fe1d4021c5af714e41e8c46f6f987..14f6f603d5030326cd1535e07af6ac117ed0c555 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -141,7 +141,7 @@ gpgme_op_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 {
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit_start", ctx,
              "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   return TRACE_ERR (edit_start (ctx, 0, 0, key, fnc, fnc_value, out));
 }
@@ -157,7 +157,7 @@ gpgme_op_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit", ctx,
              "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   err = edit_start (ctx, 1, 0, key, fnc, fnc_value, out);
@@ -175,7 +175,7 @@ gpgme_op_card_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 {
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit_start", ctx,
              "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   return TRACE_ERR (edit_start (ctx, 0, 1, key, fnc, fnc_value, out));
 }
@@ -191,7 +191,7 @@ gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit", ctx,
              "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-             (key->subkeys && !key->subkeys->fpr) ? 
+             (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   err = edit_start (ctx, 1, 1, key, fnc, fnc_value, out);
   if (!err)

diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c
index c80cb2a146b1417c26b2eabe582b8c4554227e6c..a381cfc0af8113f1976098e5882a9c03a66df305 100644 (file)
--- a/src/encrypt-sign.c
+++ b/src/encrypt-sign.c
@@ -101,8 +101,8 @@ gpgme_op_encrypt_sign_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
        {
-         TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }
@@ -131,8 +131,8 @@ gpgme_op_encrypt_sign (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
        {
-         TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }

diff --git a/src/encrypt.c b/src/encrypt.c
index c59292ff4b766bf9c4d66bf67aa2352890752dfd..12197925f1779eb5bd74197a7c6781bb099b71a0 100644 (file)
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -236,8 +236,8 @@ gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
        {
-         TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }
@@ -266,7 +266,7 @@ gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_key_t recp[],
       while (recp[i])
        {
          TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }

diff --git a/src/export.c b/src/export.c
index 70f972845ee0bcf9c81e4e224aecd7984ce6e66d..d57dc68e36cf4fc5b67a8d9a2d6ecf2de995bcde 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -253,8 +253,8 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx,
 
       while (keys[i])
        {
-         TRACE_LOG3 ("keys[%i] = %p (%s)", i,keys[i],
-                     (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
+                     (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
                      keys[i]->subkeys->fpr : "invalid");
          i++;
        }
@@ -280,8 +280,8 @@ gpgme_op_export_keys (gpgme_ctx_t ctx,
 
       while (keys[i])
        {
-         TRACE_LOG3 ("keys[%i] = %p (%s)", i,keys[i],
-                     (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
+                     (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
                      keys[i]->subkeys->fpr : "invalid");
          i++;
        }

diff --git a/src/import.c b/src/import.c
index 1f6ece11292e2b64806c058f45cdba7e5a6962b5..f4aef2f29149cba4531753ced81bcf685ff39aef 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -366,7 +366,7 @@ gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t *keys)
       while (keys[i])
        {
          TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
-                     (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+                     (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
                      keys[i]->subkeys->fpr : "invalid");
          i++;
        }
@@ -400,7 +400,7 @@ gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t *keys)
       while (keys[i])
        {
          TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
-                     (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+                     (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
                      keys[i]->subkeys->fpr : "invalid");
          i++;
        }

diff --git a/src/keylist.c b/src/keylist.c
index e344b3131183fc7d078ccf7fc4b474c734d0cdf7..424a8654aaa49fdbf6ac9332e650339a23cb032b 100644 (file)
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -965,7 +965,7 @@ gpgme_op_keylist_next (gpgme_ctx_t ctx, gpgme_key_t *r_key)
   free (queue_item);
 
   return TRACE_SUC2 ("key=%p (%s)", *r_key,
-                    ((*r_key)->subkeys && !(*r_key)->subkeys->fpr) ? 
+                    ((*r_key)->subkeys && (*r_key)->subkeys->fpr) ? 
                     (*r_key)->subkeys->fpr : "invalid");
 }
 
@@ -1060,7 +1060,7 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
   if (! err)
     {
       TRACE_LOG2 ("key=%p (%s)", *r_key,
-                 ((*r_key)->subkeys && !(*r_key)->subkeys->fpr) ? 
+                 ((*r_key)->subkeys && (*r_key)->subkeys->fpr) ? 
                  (*r_key)->subkeys->fpr : "invalid");
     }
   return TRACE_ERR (err);

diff --git a/src/signers.c b/src/signers.c
index da7d3196baf79173434eba34ddfd3bb1b6fb9327..9eb4e4e7e4b008d568a2c706ee1722e73253979d 100644 (file)
--- a/src/signers.c
+++ b/src/signers.c
@@ -59,7 +59,7 @@ gpgme_error_t
 gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key)
 {
   TRACE_BEG2 (DEBUG_CTX, "gpgme_signers_add", ctx,
-             "key=%p (%s)", key, (key->subkeys && !key->subkeys->fpr) ? 
+             "key=%p (%s)", key, (key->subkeys && key->subkeys->fpr) ? 
              key->subkeys->fpr : "invalid");
 
   if (!ctx || !key)