Differences From Artifact [1a2dbaaf85]:
- File
src/OFKernelEventObserver.m
— part of check-in
[6b77a5dd8b]
at
2017-05-21 21:28:57
on branch trunk
— Prefix private methods with of_ instead of OF_
This matches Apple's style. (user: js, size: 8794) [annotate] [blame] [check-ins using]
To Artifact [01c61511ac]:
- File
src/OFKernelEventObserver.m
— part of check-in
[b4cd87cd81]
at
2017-05-21 23:57:34
on branch trunk
— Use closesocket() instead of close()
Previously, socket_helpers.h would just define close() to whatever is
needed to close a socket. However, this makes it possible to
accidentally call a socket-specific close on something that is not a
socket. Having to explicitly call closesocket() (and defining it to
close() on platforms where it's the same) prevents this. (user: js, size: 8919) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 |
}
return self;
}
- (void)dealloc
{
close(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
close(_cancelFD[1]);
[_readObjects release];
[_writeObjects release];
#ifdef OF_HAVE_THREADS
[_mutex release];
#endif
| > > > > > > | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 |
}
return self;
}
- (void)dealloc
{
#ifdef OF_HAVE_PIPE
close(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
close(_cancelFD[1]);
#else
closesocket(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
closesocket(_cancelFD[1]);
#endif
[_readObjects release];
[_writeObjects release];
#ifdef OF_HAVE_THREADS
[_mutex release];
#endif
|
| ︙ | ︙ |