[svn] gpgme - r1256 - in trunk: doc gpgme

[svn author wk]

Author: wk
Date: 2007-09-14 14:27:54 +0200 (Fri, 14 Sep 2007)
New Revision: 1256

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpgme.texi
   trunk/gpgme/ChangeLog
   trunk/gpgme/data-mem.c
   trunk/gpgme/verify.c
Log:
Fixed bug in gpgme_data_relase_and_get_mem.
Typo fixes.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-09-13 22:41:54 UTC (rev 1255)
+++ trunk/doc/ChangeLog	2007-09-14 12:27:54 UTC (rev 1256)
@@ -1,3 +1,7 @@
+2007-09-11  Werner Koch  <wk at g10code.com>
+
+	* gpgme.texi (I/O Callback Example): Typo fix.
+
 2007-08-07  Werner Koch  <wk at g10code.com>
 
 	* gpgme.texi (Verify): Describe chain_model.

Modified: trunk/doc/gpgme.texi
===================================================================
--- trunk/doc/gpgme.texi	2007-09-13 22:41:54 UTC (rev 1255)
+++ trunk/doc/gpgme.texi	2007-09-14 12:27:54 UTC (rev 1256)
@@ -5031,7 +5031,7 @@
 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

Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-09-13 22:41:54 UTC (rev 1255)
+++ trunk/gpgme/ChangeLog	2007-09-14 12:27:54 UTC (rev 1256)
@@ -1,3 +1,7 @@
+2007-09-14  Werner Koch  <wk at g10code.com>
+
+	* data-mem.c (gpgme_data_release_and_get_mem): Fix tracing bug.
+
 2007-09-14  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgme.c (gpgme_release): Call gpgme_sig_notation_clear.

Modified: trunk/gpgme/data-mem.c
===================================================================
--- trunk/gpgme/data-mem.c	2007-09-13 22:41:54 UTC (rev 1255)
+++ trunk/gpgme/data-mem.c	2007-09-14 12:27:54 UTC (rev 1256)
@@ -257,7 +257,14 @@
 
   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;
 }
 

Modified: trunk/gpgme/verify.c
===================================================================
--- trunk/gpgme/verify.c	2007-09-13 22:41:54 UTC (rev 1255)
+++ trunk/gpgme/verify.c	2007-09-14 12:27:54 UTC (rev 1256)
@@ -552,7 +552,7 @@
         {
           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;
         }
     }