Index: src/OFKernelEventObserver+Private.h ================================================================== --- src/OFKernelEventObserver+Private.h +++ src/OFKernelEventObserver+Private.h @@ -20,7 +20,7 @@ - (void)OF_addFileDescriptorForReading: (int)fd; - (void)OF_addFileDescriptorForWriting: (int)fd; - (void)OF_removeFileDescriptorForReading: (int)fd; - (void)OF_removeFileDescriptorForWriting: (int)fd; - (void)OF_processQueueAndStoreRemovedIn: (OFMutableArray*)removed; -- (bool)OF_processCache; +- (bool)OF_processReadBuffers; @end Index: src/OFKernelEventObserver.m ================================================================== --- src/OFKernelEventObserver.m +++ src/OFKernelEventObserver.m @@ -398,15 +398,15 @@ OF_ENSURE(sendto(_cancelFD[1], "", 1, 0, (struct sockaddr*)&_cancelAddr, sizeof(_cancelAddr)) > 0); #endif } -- (bool)OF_processCache +- (bool)OF_processReadBuffers { id const *objects = [_readObjects objects]; size_t i, count = [_readObjects count]; - bool foundInCache = false; + bool foundInReadBuffer = false; for (i = 0; i < count; i++) { void *pool = objc_autoreleasePoolPush(); if ([objects[i] isKindOfClass: [OFStream class]] && @@ -414,21 +414,21 @@ ![objects[i] OF_isWaitingForDelimiter]) { if ([_delegate respondsToSelector: @selector(objectIsReadyForReading:)]) [_delegate objectIsReadyForReading: objects[i]]; - foundInCache = true; + foundInReadBuffer = true; } objc_autoreleasePoolPop(pool); } /* - * As long as we have data in the cache for any stream, we don't want - * to block. + * As long as we have data in the read buffer for any stream, we don't + * want to block. */ - if (foundInCache) + if (foundInReadBuffer) return true; return false; } @end Index: src/OFKernelEventObserver_kqueue.m ================================================================== --- src/OFKernelEventObserver_kqueue.m +++ src/OFKernelEventObserver_kqueue.m @@ -135,11 +135,11 @@ * Make sure to keep the streams retained and thus the file descriptors * valid until the actual change has been performed. */ [self OF_processQueueAndStoreRemovedIn: _removedArray]; - if ([self OF_processCache]) { + if ([self OF_processReadBuffers]) { objc_autoreleasePoolPop(pool); return true; } objc_autoreleasePoolPop(pool); Index: src/OFKernelEventObserver_poll.m ================================================================== --- src/OFKernelEventObserver_poll.m +++ src/OFKernelEventObserver_poll.m @@ -137,11 +137,11 @@ int events; size_t i, nFDs, realEvents = 0; [self OF_processQueueAndStoreRemovedIn: nil]; - if ([self OF_processCache]) { + if ([self OF_processReadBuffers]) { objc_autoreleasePoolPop(pool); return true; } objc_autoreleasePoolPop(pool); Index: src/OFKernelEventObserver_select.m ================================================================== --- src/OFKernelEventObserver_select.m +++ src/OFKernelEventObserver_select.m @@ -89,11 +89,11 @@ int events; size_t i, count, realEvents = 0; [self OF_processQueueAndStoreRemovedIn: nil]; - if ([self OF_processCache]) { + if ([self OF_processReadBuffers]) { objc_autoreleasePoolPop(pool); return true; } objc_autoreleasePoolPop(pool);