[Pkg-gnupg-commit] [libassuan] 236/437: src/ 2008-10-29 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit d1347f67d0a482861de4822ca34f287be54f141a
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Wed Oct 29 19:52:36 2008 +0000

    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.
---
 doc/ChangeLog   | 5 +++++
 doc/assuan.texi | 2 +-
 src/ChangeLog   | 7 +++++++
 src/assuan.h    | 9 +++++----
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f5fa9d0..cfc0e48 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -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
diff --git a/doc/assuan.texi b/doc/assuan.texi
index c8a1ca0..479d4bb 100644
--- a/doc/assuan.texi
+++ b/doc/assuan.texi
@@ -772,7 +772,7 @@ Now that we have a connection to the server, all work may be
 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
diff --git a/src/ChangeLog b/src/ChangeLog
index d114b47..ec6afaf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/assuan.h b/src/assuan.h
index a99e89b..f2d2feb 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -346,7 +346,8 @@ typedef enum
 
 #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_get_peercred (assuan_context_t ctx,
 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);
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git