diff options
| author | Werner Koch <[email protected]> | 2005-03-22 09:11:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-03-22 09:11:28 +0000 |
| commit | d285de6c55d8de2be7da928d099e1b23a5ef1b58 (patch) | |
| tree | 2b28cbbd11eb5c3760b9f1226247dddcae15dce8 | |
| parent | post release updates (diff) | |
| download | gpgme-d285de6c55d8de2be7da928d099e1b23a5ef1b58.tar.gz gpgme-d285de6c55d8de2be7da928d099e1b23a5ef1b58.zip | |
(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��.
| -rw-r--r-- | assuan/ChangeLog | 6 | ||||
| -rw-r--r-- | assuan/assuan-buffer.c | 4 | ||||
| -rw-r--r-- | assuan/assuan-defs.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/assuan/ChangeLog b/assuan/ChangeLog index 1cf2b2ac..b73a5dae 100644 --- a/assuan/ChangeLog +++ b/assuan/ChangeLog @@ -1,3 +1,9 @@ +2005-03-22 Werner Koch <[email protected]> + + * 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 <[email protected]> * assuan-pipe-connect.c (do_finish): Do not wait for child to finish. diff --git a/assuan/assuan-buffer.c b/assuan/assuan-buffer.c index 01e77001..d9163b79 100644 --- a/assuan/assuan-buffer.c +++ b/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/assuan/assuan-defs.h b/assuan/assuan-defs.h index 1f7f1f03..248dbf4e 100644 --- a/assuan/assuan-defs.h +++ b/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. */ |