[svn] assuan - r291 - in trunk: doc src

[svn author marcus]

Author: marcus
Date: 2008-10-29 20:52:36 +0100 (Wed, 29 Oct 2008)
New Revision: 291

Modified:
   trunk/doc/ChangeLog
   trunk/doc/assuan.texi
   trunk/src/ChangeLog
   trunk/src/assuan.h
Log:
src/
2008-10-29  Marcus Brinkmann  <marcus at g10code.de>

	* assuan.h (assuan_error_t) (_ASSUAN_ONLY_GPG_ERRORS): Make
	unsigned int.
	(assuan_transact): Change return type of callback handlers to
	assuan_error_t.

doc/
2008-10-29  Marcus Brinkmann  <marcus at g10code.de>

	* assuan.texi: Change return type of callback handlers in
	assuan_transact.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2008-10-15 10:50:50 UTC (rev 290)
+++ trunk/doc/ChangeLog	2008-10-29 19:52:36 UTC (rev 291)
@@ -1,3 +1,8 @@
+2008-10-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* assuan.texi: Change return type of callback handlers in
+	assuan_transact.
+
 2007-11-14  Werner Koch  <wk at g10code.com>
 
 	* assuan.texi (Client code): Describe the new flag bit 7 of the

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-10-15 10:50:50 UTC (rev 290)
+++ trunk/src/ChangeLog	2008-10-29 19:52:36 UTC (rev 291)
@@ -1,3 +1,10 @@
+2008-10-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* assuan.h (assuan_error_t) (_ASSUAN_ONLY_GPG_ERRORS): Make
+	unsigned int.
+	(assuan_transact): Change return type of callback handlers to
+	assuan_error_t.
+
 2008-10-15  Werner Koch  <wk at g10code.com>
 
 	* assuan-logging.c (_assuan_log_printf): Flush if the format

Modified: trunk/doc/assuan.texi
===================================================================
--- trunk/doc/assuan.texi	2008-10-15 10:50:50 UTC (rev 290)
+++ trunk/doc/assuan.texi	2008-10-29 19:52:36 UTC (rev 291)
@@ -772,7 +772,7 @@
 conveniently done using a couple of callbacks and the transact
 function:
 
- at deftypefun assuan_error_t assuan_transact (@w{assuan_context_t @var{ctx}}, @w{const char *@var{command}}, @w{int (*@var{data_cb})(void *, const void *, size_t)}, @w{void *@var{data_cb_arg}}, @w{int (*@var{inquire_cb})(void*, const char *)}, @w{void *@var{inquire_cb_arg}}, @w{int (*@var{status_cb})(void*, const char *)}, @w{void *@var{status_cb_arg}})
+ at deftypefun assuan_error_t assuan_transact (@w{assuan_context_t @var{ctx}}, @w{const char *@var{command}}, @w{assuan_error_t (*@var{data_cb})(void *, const void *, size_t)}, @w{void *@var{data_cb_arg}}, @w{assuan_error_t (*@var{inquire_cb})(void*, const char *)}, @w{void *@var{inquire_cb_arg}}, @w{assuan_error_t (*@var{status_cb})(void*, const char *)}, @w{void *@var{status_cb_arg}})
 
 Here @var{ctx} is the Assuan context opened by one of the connect
 calls.  @var{command} is the actual one liner Assuan command.  It

Modified: trunk/src/assuan.h
===================================================================
--- trunk/src/assuan.h	2008-10-15 10:50:50 UTC (rev 290)
+++ trunk/src/assuan.h	2008-10-29 19:52:36 UTC (rev 291)
@@ -346,7 +346,8 @@
 
 #else  /*!_ASSUAN_ONLY_GPG_ERRORS*/
 
-typedef int assuan_error_t;
+/* Choose a type compatible with gpg_error_t.  */
+typedef unsigned int assuan_error_t;
 
 #endif /*!_ASSUAN_ONLY_GPG_ERRORS*/
 
@@ -538,11 +539,11 @@
 assuan_error_t 
 assuan_transact (assuan_context_t ctx,
                  const char *command,
-                 int (*data_cb)(void *, const void *, size_t),
+                 assuan_error_t (*data_cb)(void *, const void *, size_t),
                  void *data_cb_arg,
-                 int (*inquire_cb)(void*, const char *),
+                 assuan_error_t (*inquire_cb)(void*, const char *),
                  void *inquire_cb_arg,
-                 int (*status_cb)(void*, const char *),
+                 assuan_error_t (*status_cb)(void*, const char *),
                  void *status_cb_arg);