diff options
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/gpgme.texi | 2 | ||||
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/data-mem.c | 9 | ||||
| -rw-r--r-- | gpgme/verify.c | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index f711a126..7328f381 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2007-09-11 Werner Koch <[email protected]> + + * gpgme.texi (I/O Callback Example): Typo fix. + 2007-08-07 Werner Koch <[email protected]> * gpgme.texi (Verify): Describe chain_model. diff --git a/doc/gpgme.texi b/doc/gpgme.texi index f480715e..4692d263 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -5031,7 +5031,7 @@ monitor these file descriptors for activity and call the appropriate I/O callbacks. The following example illustrates how to do that. The example uses -locking to show in which way the the callbacks and the event loop can +locking to show in which way the callbacks and the event loop can run concurrently. For the event loop, we use a fixed array. For a real-world implementation, you should use a dynamically sized structure because the number of file descriptors needed for a crypto diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index d115dc61..53a1d0b8 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2007-09-14 Werner Koch <[email protected]> + + * data-mem.c (gpgme_data_release_and_get_mem): Fix tracing bug. + 2007-09-14 Marcus Brinkmann <[email protected]> * gpgme.c (gpgme_release): Call gpgme_sig_notation_clear. diff --git a/gpgme/data-mem.c b/gpgme/data-mem.c index bc718065..b58a3c04 100644 --- a/gpgme/data-mem.c +++ b/gpgme/data-mem.c @@ -257,7 +257,14 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len) gpgme_data_release (dh); - TRACE_SUC2 ("buffer=%p, len=%u", str, *r_len); + if (r_len) + { + TRACE_SUC2 ("buffer=%p, len=%u", str, *r_len); + } + else + { + TRACE_SUC1 ("buffer=%p", str); + } return str; } diff --git a/gpgme/verify.c b/gpgme/verify.c index 71221bb7..ef1ccd6c 100644 --- a/gpgme/verify.c +++ b/gpgme/verify.c @@ -552,7 +552,7 @@ parse_trust (gpgme_signature_t sig, gpgme_status_code_t code, char *args) { while (*args == ' ') args++; - if (!strncmp (args, "cm", 2) && (args[2] == ' ' || !args[2])) + if (!strncmp (args, "chain", 2) && (args[2] == ' ' || !args[2])) sig->chain_model = 1; } } |