From: Werner Koch Date: Tue, 22 Mar 2005 09:11:28 +0000 (+0000) Subject: (struct assuan_io): Renamed elements READ and X-Git-Tag: gpgme-1.2.0@1385~337 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c649e5316d373943ba0e8a05d28139761702eee1;p=gpgme.git (struct assuan_io): Renamed elements READ and WRITE to READFNC and WRITEFNC to avoid problems with read defined as macro. Changed callers. Noted by Ville Skytt��. --- diff --git a/branches/gpgme-1-0-branch/assuan/ChangeLog b/branches/gpgme-1-0-branch/assuan/ChangeLog index 1cf2b2a..b73a5da 100644 --- a/branches/gpgme-1-0-branch/assuan/ChangeLog +++ b/branches/gpgme-1-0-branch/assuan/ChangeLog @@ -1,3 +1,9 @@ +2005-03-22 Werner Koch + + * assuan-defs.h (struct assuan_io): Renamed elements READ and + WRITE to READFNC and WRITEFNC to avoid problems with read defined + as macro. Changed callers. Noted by Ville Skyttä. + 2004-12-16 Marcus Brinkmann * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. diff --git a/branches/gpgme-1-0-branch/assuan/assuan-buffer.c b/branches/gpgme-1-0-branch/assuan/assuan-buffer.c index 01e7700..d9163b7 100644 --- a/branches/gpgme-1-0-branch/assuan/assuan-buffer.c +++ b/branches/gpgme-1-0-branch/assuan/assuan-buffer.c @@ -32,7 +32,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) { @@ -58,7 +58,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/branches/gpgme-1-0-branch/assuan/assuan-defs.h b/branches/gpgme-1-0-branch/assuan/assuan-defs.h index 1f7f1f0..248dbf4 100644 --- a/branches/gpgme-1-0-branch/assuan/assuan-defs.h +++ b/branches/gpgme-1-0-branch/assuan/assuan-defs.h @@ -39,9 +39,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. */ AssuanError (*sendfd) (ASSUAN_CONTEXT, int); /* Receive a file descriptor. */