Code review fixes

Author: kovpas

CoreFoundation/RunLoop.subproj/CFRunLoop.c

@@ -2406,8 +2406,9 @@ static Boolean __CFRunLoopServiceFileDescriptors(__CFPortSet portSet, __CFPort o
         } while (result == -1 && errno == EINTR);
         CFAssert2(result >= 0, __kCFLogAssertion, "%s(): error %d from epoll_wait", __PRETTY_FUNCTION__, errno);
 
-        if (result == 0)
+        if (result == 0) {
             return false;
+        }
 
         awokenFd = event.data.fd;
     }

Foundation/NSRunLoop.swift

@@ -13,14 +13,13 @@ public let NSDefaultRunLoopMode: String = kCFRunLoopDefaultMode._swiftObject
 public let NSRunLoopCommonModes: String = kCFRunLoopCommonModes._swiftObject
 
 public class NSRunLoop : NSObject {
-    typealias CFType = CFRunLoopRef
-    internal var _cfObject : CFType!
+    internal var _cfRunLoop : CFRunLoopRef!
     internal static var _mainRunLoop : NSRunLoop = {
         return NSRunLoop(cfObject: CFRunLoopGetMain())
     }()
 
     internal init(cfObject : CFRunLoopRef) {
-        _cfObject = cfObject
+        _cfRunLoop = cfObject
     }
 
     public class func currentRunLoop() -> NSRunLoop {
@@ -32,25 +31,28 @@ public class NSRunLoop : NSObject {
     }
 
     public var currentMode: String? {
-        return CFRunLoopCopyCurrentMode(_cfObject)?._swiftObject
+        return CFRunLoopCopyCurrentMode(_cfRunLoop)?._swiftObject
     }
 
     public func addTimer(timer: NSTimer, forMode mode: String) {
         CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer._cfObject, mode._cfObject)
     }
 
     public func addPort(aPort: NSPort, forMode mode: String) {
-//        CFRunLoopAddSource(CFRunLoopGetCurrent(), aPort._cfObject, mode._cfObject)
         NSUnimplemented()
     }
 
     public func removePort(aPort: NSPort, forMode mode: String) {
-//        CFRunLoopRemoveSource(CFRunLoopGetCurrent(), aPort._cfObject, mode._cfObject)
         NSUnimplemented()
     }
 
     public func limitDateForMode(mode: String) -> NSDate? {
         let nextTimerFireAbsoluteTime = CFRunLoopGetNextTimerFireDate(CFRunLoopGetCurrent(), mode._cfObject)
+        
+        if (nextTimerFireAbsoluteTime == 0) {
+            return NSDate.distantFuture()
+        }
+        
         return NSDate(timeIntervalSinceReferenceDate: nextTimerFireAbsoluteTime)
     }
 

closure/runtime.c

@@ -12,12 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#if TARGET_OS_LINUX
-#define __USE_GNU
 #include <dlfcn.h>
-#else
-#include <dlfcn.h>
-#endif
 #if __has_include(<os/assumes.h>)
 #include <os/assumes.h>
 #else