ObjFW  Check-in [3b41905658]

Overview
Comment:OFKqueueKernelEventObserver: Fix type of udata
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3b41905658641eb6e0f957c4fb5c93bbd2009fd438c67df3682582dacaeb3ee6
User & Date: js on 2020-12-30 14:53:00
Other Links: manifest | tags
Context
2020-12-31
14:34
Don't check for nanosleep() on AmigaOS / MorphOS check-in: d31c61cee7 user: js tags: trunk
2020-12-30
14:53
OFKqueueKernelEventObserver: Fix type of udata check-in: 3b41905658 user: js tags: trunk
00:05
runtime/amiga-library.m: Fix copyright check-in: 5e5b369f05 user: js tags: trunk
Changes

Modified src/OFKqueueKernelEventObserver.m from [56c8bac78d] to [efcb9ce70b].

85
86
87
88
89
90
91


92
93



94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112


113
114



115
116
117
118
119
120
121
122
123
124
85
86
87
88
89
90
91
92
93


94
95
96



97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114


115
116
117



118
119
120
121
122
123
124







+
+
-
-
+
+
+
-
-
-
















+
+
-
-
+
+
+
-
-
-







{
	struct kevent event;

	memset(&event, 0, sizeof(event));
	event.ident = object.fileDescriptorForReading;
	event.filter = EVFILT_READ;
	event.flags = EV_ADD;
	/*
	 * Ugly hack required for NetBSD: NetBSD used `intptr_t` for udata, but
#ifndef OF_NETBSD
	event.udata = object;
	 * switched this to `void *` in NetBSD 10.
	 */
	event.udata = (__typeof__(event.udata))object;
#else
	event.udata = (intptr_t)object;
#endif

	if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
		@throw [OFObserveFailedException exceptionWithObserver: self
								 errNo: errno];

	[super addObjectForReading: object];
}

- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
	struct kevent event;

	memset(&event, 0, sizeof(event));
	event.ident = object.fileDescriptorForWriting;
	event.filter = EVFILT_WRITE;
	event.flags = EV_ADD;
	/*
	 * Ugly hack required for NetBSD: NetBSD used `intptr_t` for udata, but
#ifndef OF_NETBSD
	event.udata = object;
	 * switched this to `void *` in NetBSD 10.
	 */
	event.udata = (__typeof__(event.udata))object;
#else
	event.udata = (intptr_t)object;
#endif

	if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
		@throw [OFObserveFailedException exceptionWithObserver: self
								 errNo: errno];

	[super addObjectForWriting: object];
}