Fixed bug in gpgme_data_relase_and_get_mem.

Typo fixes.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f711a126d434c79c882d147c580077a68482bb01..7328f3811161113be962f4abc34a7602f4860454 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-11  Werner Koch  <wk@g10code.com>
+
+       * gpgme.texi (I/O Callback Example): Typo fix.
+
 2007-08-07  Werner Koch  <wk@g10code.com>
 
        * gpgme.texi (Verify): Describe chain_model.

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index f480715e26f67461adb037e532a7e21cb2609939..4692d263fb2ed8fc38ca333c360b0e5095f2ee07 100644 (file)
--- 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 d115dc61b26058b7885930ffa6d09c81b9c66d23..53a1d0b8c382e3d3c80618934785add68e075d80 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-14  Werner Koch  <wk@g10code.com>
+
+       * data-mem.c (gpgme_data_release_and_get_mem): Fix tracing bug.
+
 2007-09-14  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpgme.c (gpgme_release): Call gpgme_sig_notation_clear.

diff --git a/gpgme/data-mem.c b/gpgme/data-mem.c
index bc718065c4123f03504a2ac73680ea847470401a..b58a3c047f6fd3f3e3f4e49ecaad2137e94861b2 100644 (file)
--- 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 71221bb71cea50470709bf6c44061483420ec5e7..ef1ccd6c5f89063b0f2a29532979aeab6f75f54d 100644 (file)
--- 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;
         }
     }