Replace the per-iop input_timeout by per-function timeouts

Commit 08b94556 (v4.3.20) added io_open() parameter input_timeout.  It
applies to io_input() and, since commit 904822e3, to io_close().  Add
timeout parameters to these functions instead.
This commit is contained in:
Markus Armbruster 2012-03-10 13:27:34 +01:00
parent 0513ec136b
commit a96b400da3
5 changed files with 32 additions and 29 deletions

View file

@ -27,7 +27,7 @@
* empio.h: Describes io pointers used in Empire
*
* Known contributors to this file:
* Markus Armbruster, 2004-2010
* Markus Armbruster, 2004-2012
*/
#ifndef EMPIO_H
@ -41,10 +41,10 @@
#define IO_BUFSIZE 4096
extern struct iop *io_open(int, int, int, struct timeval);
extern struct iop *io_open(int, int, int);
extern void io_init(void);
extern void io_close(struct iop *);
extern int io_input(struct iop *, int);
extern void io_close(struct iop *, struct timeval *);
extern int io_input(struct iop *, struct timeval *);
extern int io_inputwaiting(struct iop *);
extern int io_outputwaiting(struct iop *);
extern int io_output(struct iop *, int);