GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(struct assuan_io): Renamed elements READ and

Browse Source 
WRITE to READFNC and WRITEFNC to avoid problems with read defined
as macro.  Changed callers.  Noted by Ville Skytt��.
This commit is contained in:
Werner Koch 2005-03-22 09:10:36 +00:00
parent 2e21a29ff9
commit 2262d604c2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assuan/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-22 Werner Koch <wk@g10code.com>
* 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 <marcus@g10code.de> 2004-12-16 Marcus Brinkmann <marcus@g10code.de>
* assuan-pipe-connect.c (do_finish): Do not wait for child to finish. * assuan-pipe-connect.c (do_finish): Do not wait for child to finish.

4
assuan/assuan-buffer.c
View File

@ -32,7 +32,7 @@ writen (ASSUAN_CONTEXT ctx, const char *buffer, size_t length)
{ {
while (length) while (length)
{ {
ssize_t nwritten = ctx->io->write (ctx, buffer, length); ssize_t nwritten = ctx->io->writefnc (ctx, buffer, length);
if (nwritten < 0) if (nwritten < 0)
{ {
@ -58,7 +58,7 @@ readline (ASSUAN_CONTEXT ctx, char *buf, size_t buflen,
*r_nread = 0; *r_nread = 0;
while (nleft > 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) if (n < 0)
{ {

4
assuan/assuan-defs.h
View File

@ -39,9 +39,9 @@ struct cmdtbl_s
struct assuan_io struct assuan_io
{ {
/* Routine to read from input_fd. */ /* 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. */ /* 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. */ /* Send a file descriptor. */
AssuanError (*sendfd) (ASSUAN_CONTEXT, int); AssuanError (*sendfd) (ASSUAN_CONTEXT, int);
/* Receive a file descriptor. */ /* Receive a file descriptor. */