Mercurial > pidgin.yaz
changeset 5495:5b678994929b
[gaim-migrate @ 5891]
gaim_xfer ft_read and ft_write back to read and write. Bracketing these funcs will avoid the macro expansion.
committer: Tailor Script <tailor@pidgin.im>
| author | Herman Bloggs <hermanator12002@yahoo.com> |
|---|---|
| date | Thu, 22 May 2003 23:59:01 +0000 |
| parents | d557a53e35c5 |
| children | b7c0be69c749 |
| files | src/ft.c src/ft.h |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ft.c Thu May 22 23:12:10 2003 +0000 +++ b/src/ft.c Thu May 22 23:59:01 2003 +0000 @@ -382,7 +382,7 @@ if (xfer == NULL) return; - xfer->ops.ft_read = fnc; + xfer->ops.read = fnc; } void @@ -393,7 +393,7 @@ if (xfer == NULL) return; - xfer->ops.ft_write = fnc; + xfer->ops.write = fnc; } void @@ -459,8 +459,8 @@ else s = MIN(gaim_xfer_get_bytes_remaining(xfer), 4096); - if (xfer->ops.ft_read != NULL) - r = xfer->ops.ft_read(buffer, xfer); + if (xfer->ops.read != NULL) + r = (xfer->ops.read)(buffer, xfer); else { *buffer = g_malloc0(s); @@ -483,8 +483,8 @@ s = MIN(gaim_xfer_get_bytes_remaining(xfer), size); - if (xfer->ops.ft_write != NULL) - r = xfer->ops.ft_write(buffer, s, xfer); + if (xfer->ops.write != NULL) + r = (xfer->ops.write)(buffer, s, xfer); else r = write(xfer->fd, buffer, s);
--- a/src/ft.h Thu May 22 23:12:10 2003 +0000 +++ b/src/ft.h Thu May 22 23:59:01 2003 +0000 @@ -96,8 +96,8 @@ void (*end)(struct gaim_xfer *xfer); void (*cancel_send)(struct gaim_xfer *xfer); void (*cancel_recv)(struct gaim_xfer *xfer); - size_t (*ft_read)(char **buffer, struct gaim_xfer *xfer); - size_t (*ft_write)(const char *buffer, size_t size, + size_t (*read)(char **buffer, struct gaim_xfer *xfer); + size_t (*write)(const char *buffer, size_t size, struct gaim_xfer *xfer); void (*ack)(struct gaim_xfer *xfer, const char *buffer, size_t size);