ObjFW  Check-in [4b08544ddd]

Overview
Comment:OFStreamObserver: Don't ignore the timeout when using select().
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 4b08544ddd87d12f5fdb6a886dc4161c9c12c2b7f0c0eab6c6f3d671720ef42c
User & Date: js on 2011-04-22 20:43:20
Other Links: manifest | tags
Context
2011-04-22
21:08
More style improvements. check-in: fb95acc8ab user: js tags: trunk
20:43
OFStreamObserver: Don't ignore the timeout when using select(). check-in: 4b08544ddd user: js tags: trunk
20:19
More style improvements. check-in: e76a7f52c1 user: js tags: trunk
Changes

Modified src/OFStreamObserver.m from [90468a0a65] to [4bdac00ac8].

485
486
487
488
489
490
491



492
493
494
495
496
497
498
	FD_COPY(&exceptfds, &exceptfds_);
# else
	readfds_ = readfds;
	writefds_ = writefds;
	exceptfds_ = exceptfds;
# endif




	if (select(nfds, &readfds_, &writefds_, &exceptfds_,
	    (timeout != -1 ? &tv : NULL)) < 1)
		return NO;

	if (FD_ISSET(cancelFd[0], &readfds_)) {
		char buf;
#ifndef _WIN32







>
>
>







485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
	FD_COPY(&exceptfds, &exceptfds_);
# else
	readfds_ = readfds;
	writefds_ = writefds;
	exceptfds_ = exceptfds;
# endif

	tv.tv_sec = timeout / 1000;
	tv.tv_usec = (timeout % 1000) * 1000;

	if (select(nfds, &readfds_, &writefds_, &exceptfds_,
	    (timeout != -1 ? &tv : NULL)) < 1)
		return NO;

	if (FD_ISSET(cancelFd[0], &readfds_)) {
		char buf;
#ifndef _WIN32