(iop): Remove unused members assoc, notify.

(io_open): Remove unused parameters assoc, notify.  Caller changed.

diff --git a/include/empio.h b/include/empio.h
index 7edc85b0f8f744e2b3a7c4bfcd56875c9426ef6a..3f22b9cb8d7c7e8e67b3901e268b80963cf57494 100644 (file)
--- 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 8a3d820e21c801af23add160d7339f378452339a..dc762a18d836d97005bb737d04424a66fd88189a 100644 (file)
--- 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 4327003384675f7cfde14c4585bb0de0333e2135..b2ea63d1bdbe13ad99d07a2d588c4b7a1ead4594 100644 (file)
--- 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;