[svn] gpgme - r1408 - trunk/src
svn author marcus
cvs at cvs.gnupg.org
Wed Oct 28 17:39:20 CET 2009
Author: marcus
Date: 2009-10-28 17:39:19 +0100 (Wed, 28 Oct 2009)
New Revision: 1408
Modified:
trunk/src/ChangeLog
trunk/src/delete.c
trunk/src/edit.c
trunk/src/encrypt-sign.c
trunk/src/encrypt.c
trunk/src/export.c
trunk/src/import.c
trunk/src/keylist.c
trunk/src/signers.c
Log:
2009-10-28 Marcus Brinkmann <marcus at 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.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/ChangeLog 2009-10-28 16:39:19 UTC (rev 1408)
@@ -1,3 +1,8 @@
+2009-10-28 Marcus Brinkmann <marcus at 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 at g10code.de>
* edit.c (gpgme_op_edit_start, gpgme_op_edit)
Modified: trunk/src/delete.c
===================================================================
--- trunk/src/delete.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/delete.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -96,7 +96,7 @@
{
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 @@
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)
Modified: trunk/src/edit.c
===================================================================
--- trunk/src/edit.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/edit.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -141,7 +141,7 @@
{
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 @@
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 @@
{
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 @@
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)
Modified: trunk/src/encrypt-sign.c
===================================================================
--- trunk/src/encrypt-sign.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/encrypt-sign.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -101,8 +101,8 @@
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 @@
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++;
}
Modified: trunk/src/encrypt.c
===================================================================
--- trunk/src/encrypt.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/encrypt.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -236,8 +236,8 @@
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 @@
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++;
}
Modified: trunk/src/export.c
===================================================================
--- trunk/src/export.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/export.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -253,8 +253,8 @@
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 @@
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++;
}
Modified: trunk/src/import.c
===================================================================
--- trunk/src/import.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/import.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -366,7 +366,7 @@
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 @@
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++;
}
Modified: trunk/src/keylist.c
===================================================================
--- trunk/src/keylist.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/keylist.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -965,7 +965,7 @@
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 @@
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);
Modified: trunk/src/signers.c
===================================================================
--- trunk/src/signers.c 2009-10-27 19:23:56 UTC (rev 1407)
+++ trunk/src/signers.c 2009-10-28 16:39:19 UTC (rev 1408)
@@ -59,7 +59,7 @@
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)
More information about the Gnupg-commits
mailing list