From 7d5a6b817e410b9f933259261f260b2d2b2bab4e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 29 Mar 2006 19:19:47 +0000 Subject: [PATCH] (iop): Remove unused members assoc, notify. (io_open): Remove unused parameters assoc, notify. Caller changed. --- include/empio.h | 2 +- src/lib/gen/io.c | 7 +------ src/lib/player/accept.c | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/include/empio.h b/include/empio.h index 7edc85b0f..3f22b9cb8 100644 --- a/include/empio.h +++ b/include/empio.h @@ -46,7 +46,7 @@ #define IO_NOWAIT 0 #define IO_WAIT 1 -extern struct iop *io_open(int, int, int, int (*)(void), s_char *); +extern struct iop *io_open(int, int, int); extern void io_init(void); extern int io_noblocking(struct iop *, int); extern void io_close(struct iop *); diff --git a/src/lib/gen/io.c b/src/lib/gen/io.c index 8a3d820e2..dc762a18d 100644 --- a/src/lib/gen/io.c +++ b/src/lib/gen/io.c @@ -73,9 +73,7 @@ struct iop { struct ioqueue *input; struct ioqueue *output; int flags; - s_char *assoc; int bufsize; - int (*notify)(void); }; void @@ -84,8 +82,7 @@ io_init(void) } struct iop * -io_open(int fd, int flags, int bufsize, int (*notify)(void), - s_char *assoc) +io_open(int fd, int flags, int bufsize) { struct iop *iop; @@ -107,8 +104,6 @@ io_open(int fd, int flags, int bufsize, int (*notify)(void), if (flags & IO_NBLOCK) io_noblocking(iop, 1); /* FIXME check success */ iop->flags = flags; - iop->assoc = assoc; - iop->notify = notify; return iop; } diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 432700338..b2ea63d1b 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -91,9 +91,7 @@ player_new(int s) memset(lp, 0, sizeof(struct player)); if (s >= 0) { /* real player, not dummy created by update and market update */ - lp->iop = io_open(s, - IO_READ | IO_WRITE | IO_NBLOCK, - IO_BUFSIZE, 0, 0); + lp->iop = io_open(s, IO_READ | IO_WRITE | IO_NBLOCK, IO_BUFSIZE); if (!lp->iop) { free(lp); return NULL; -- 2.43.0