ObjFW  Check-in [13d72034ed]

Overview
Comment:OFKernelEventObserver_poll: Exception -> assert
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 13d72034edb8a7edfe5725001d071e87b32b7fb3987dfbf91fe99890d3722ef4
User & Date: js on 2015-05-16 18:28:47
Other Links: manifest | tags
Context
2015-05-16
18:32
utils/ofhttp: Get terminal width for progress bar check-in: 84f2ba7fbc user: js tags: trunk
18:28
OFKernelEventObserver_poll: Exception -> assert check-in: 13d72034ed user: js tags: trunk
15:16
OFKernelEventObserver_select: Ensure fd >= 0 check-in: a54a47a4c3 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/OFKernelEventObserver_poll.m from [6db686d146] to [948bc3a27e].

︙︙
14
15
16
17
18
19
20

21
22
23
24
25
26
27

 * file.
 */

#define __NO_EXT_QNX

#include "config.h"


#include <errno.h>

#ifdef HAVE_POLL_H
# include <poll.h>
#endif

#import "OFKernelEventObserver.h"








>








14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

 * file.
 */

#define __NO_EXT_QNX

#include "config.h"

#include <assert.h>
#include <errno.h>

#ifdef HAVE_POLL_H
# include <poll.h>
#endif

#import "OFKernelEventObserver.h"
︙︙
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191

	    (int)(timeInterval != -1 ? timeInterval * 1000 : -1));

	if (events < 0)
		@throw [OFObserveFailedException exceptionWithObserver: self
								 errNo: errno];

	for (i = 0; i < nFDs; i++) {
		if (FDs[i].fd > _maxFD)
			@throw [OFOutOfRangeException exception];

		if (FDs[i].revents & POLLIN) {
			if (FDs[i].fd == _cancelFD[0]) {
				char buffer;

				OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
				FDs[i].revents = 0;








|
<








177
178
179
180
181
182
183
184

185
186
187
188
189
190
191

	    (int)(timeInterval != -1 ? timeInterval * 1000 : -1));

	if (events < 0)
		@throw [OFObserveFailedException exceptionWithObserver: self
								 errNo: errno];

	for (i = 0; i < nFDs; i++) {
		assert(FDs[i].fd <= _maxFD);


		if (FDs[i].revents & POLLIN) {
			if (FDs[i].fd == _cancelFD[0]) {
				char buffer;

				OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
				FDs[i].revents = 0;
︙︙