[Pkg-gnupg-commit] [libassuan] 137/437: (struct assuan_io): Renamed elements READ and WRITE to READFNC and WRITEFNC to avoid problems with read defined as macros. Changed callers. Noted by Ville Skytt��.

[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 39002aeb0f856235d6b29abd16fa8ca78f9304e9
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 22 08:53:17 2005 +0000

    (struct assuan_io): Renamed elements READ and
    WRITE to READFNC and WRITEFNC to avoid problems with read defined
    as macros.  Changed callers.  Noted by Ville Skytt��.
---
 src/ChangeLog        | 11 +++++++++++
 src/assuan-buffer.c  |  4 ++--
 src/assuan-client.c  |  3 +++
 src/assuan-defs.h    |  4 ++--
 src/assuan-handler.c |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d50e1c9..3e04b78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2005-03-22  Werner Koch  <wk at g10code.com>
+
+	* assuan-defs.h (struct assuan_io): Renamed elements READ and
+	WRITE to READFNC and WRITEFNC to avoid problems with read defined
+	as macros.  Changed callers.  Noted by Ville Skyttä.
+
+2005-02-24  Werner Koch  <wk at g10code.com>
+
+	* assuan-client.c (assuan_transact): Handle empty and comment
+	commands correctly.
+
 2004-12-20  Werner Koch  <wk at g10code.com>
 
 	* assuan-socket-connect.c (assuan_socket_connect) [W32]: Allow for
diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c
index 73ec828..99ea72e 100644
--- a/src/assuan-buffer.c
+++ b/src/assuan-buffer.c
@@ -35,7 +35,7 @@ writen (ASSUAN_CONTEXT ctx, const char *buffer, size_t length)
 {
   while (length)
     {
-      ssize_t nwritten = ctx->io->write (ctx, buffer, length);
+      ssize_t nwritten = ctx->io->writefnc (ctx, buffer, length);
       
       if (nwritten < 0)
         {
@@ -61,7 +61,7 @@ readline (ASSUAN_CONTEXT ctx, char *buf, size_t buflen,
   *r_nread = 0;
   while (nleft > 0)
     {
-      ssize_t n = ctx->io->read (ctx, buf, nleft);
+      ssize_t n = ctx->io->readfnc (ctx, buf, nleft);
 
       if (n < 0)
         {
diff --git a/src/assuan-client.c b/src/assuan-client.c
index 212eb61..a218994 100644
--- a/src/assuan-client.c
+++ b/src/assuan-client.c
@@ -144,6 +144,9 @@ assuan_transact (ASSUAN_CONTEXT ctx,
   if (rc)
     return rc;
 
+  if (*command == '#' || !*command)
+    return 0; /* Don't expect a response for a comment line.  */
+
  again:
   rc = _assuan_read_from_server (ctx, &okay, &off);
   if (rc)
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index 0cb5400..a5b45ee 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -71,9 +71,9 @@ struct cmdtbl_s
 struct assuan_io
 {
   /* Routine to read from input_fd.  */
-  ssize_t (*read) (ASSUAN_CONTEXT, void *, size_t);
+  ssize_t (*readfnc) (ASSUAN_CONTEXT, void *, size_t);
   /* Routine to write to output_fd.  */
-  ssize_t (*write) (ASSUAN_CONTEXT, const void *, size_t);
+  ssize_t (*writefnc) (ASSUAN_CONTEXT, const void *, size_t);
   /* Send a file descriptor.  */
   assuan_error_t (*sendfd) (ASSUAN_CONTEXT, int);
   /* Receive a file descriptor.  */
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 7be48e6..21501a3 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -544,7 +544,7 @@ process_request (ASSUAN_CONTEXT ctx)
  * assuan_process:
  * @ctx: assuan context
  * 
- * This fucntion is used to handle the assuan protocol after a
+ * This function is used to handle the assuan protocol after a
  * connection has been established using assuan_accept().  This is the
  * main protocol handler.
  * 

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