[Pkg-gnupg-commit] [libassuan] 244/437: 2009-09-01 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 a974403c7c98c07411de2e93c2265bf101dfcdf2
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Tue Sep 1 14:42:17 2009 +0000

    2009-09-01  Marcus Brinkmann  <marcus at g10code.de>
    
    	* assuan.h (ASSUAN_INT2FD, ASSUAN_FD2INT): Remove macros.
    	* assuan-defs.h (DIMof): Remove macro.
---
 src/ChangeLog     |  3 +++
 src/assuan-defs.h | 11 ++++-------
 src/assuan.h      |  4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index c97ce5d..e67ce87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-01  Marcus Brinkmann  <marcus at g10code.de>
 
+	* assuan.h (ASSUAN_INT2FD, ASSUAN_FD2INT): Remove macros.
+	* assuan-defs.h (DIMof): Remove macro.
+
 	* setenv.c: Do not include "assuan-defs.h", instead redefine
 	setenv, unsetenv, clearenv in place.
 	* assuan-socket-server.c: Use _assuan_free instead of xfree.
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index 485ce40..194853f 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -47,13 +47,12 @@ struct cmdtbl_s
 };
 
 
-/* A structure to dispatch I/O functions.  All these functions need to
-   return 0 on success and set ERRNO on failure.  */
+/* A structure to dispatch I/O functions.  */
 struct assuan_io
 {
-  /* Routine to read from input_fd.  */
+  /* Routine to read from input_fd.  Sets errno on failure.  */
   ssize_t (*readfnc) (assuan_context_t, void *, size_t);
-  /* Routine to write to output_fd.  */
+  /* Routine to write to output_fd.  Sets errno on failure.  */
   ssize_t (*writefnc) (assuan_context_t, const void *, size_t);
   /* Send a file descriptor.  */
   gpg_error_t (*sendfd) (assuan_context_t, assuan_fd_t);
@@ -75,7 +74,7 @@ struct assuan_context_s
   /* Context specific flags (cf. assuan_flag_t). */
   struct
   {
-    unsigned int no_waitpid:1; /* See ASSUAN_NO_WAITPID. */
+    unsigned int no_waitpid : 1; /* See ASSUAN_NO_WAITPID. */
   } flags;
 
   int confidential;
@@ -313,8 +312,6 @@ int putc_unlocked (int c, FILE *stream);
 #endif
 
 #define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
-#define DIMof(type,member)   DIM(((type *)0)->member)
-
 
 #if HAVE_W32_SYSTEM
 #define SOCKET2HANDLE(s) ((void *)(s))
diff --git a/src/assuan.h b/src/assuan.h
index 306dd75..9755696 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -243,13 +243,9 @@ typedef struct assuan_context_s *assuan_context_t;
 #ifdef _WIN32
 typedef void *assuan_fd_t;
 #define ASSUAN_INVALID_FD ((void*)(-1))
-#define ASSUAN_INT2FD(s)  ((void *)(s))
-#define ASSUAN_FD2INT(h)  ((unsigned int)(h))
 #else
 typedef int assuan_fd_t;
 #define ASSUAN_INVALID_FD (-1)
-#define ASSUAN_INT2FD(s)  ((s))
-#define ASSUAN_FD2INT(h)  ((h))
 #endif
 
 

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