Differences From Artifact [d21ff8bef4]:
- File src/OFRunLoop.m — part of check-in [e40729d406] at 2013-02-12 18:22:15 on branch trunk — Prefix all ivars with an underscore. (user: js, size: 14618) [annotate] [blame] [check-ins using]
To Artifact [d42000199a]:
- File
src/OFRunLoop.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 14622) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
396 397 398 399 400 401 402 | removeStreamForReading: stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif | | | | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | removeStreamForReading: stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif bool (*func)(id, SEL, OFStream*, void*, size_t, OFException*) = (bool(*)(id, SEL, OFStream*, void*, size_t, OFException*)) [queueItem->_target methodForSelector: queueItem->_selector]; if (!func(queueItem->_target, queueItem->_selector, stream, queueItem->_buffer, length, exception)) { [queue removeListObject: listObject]; |
︙ | ︙ | |||
455 456 457 458 459 460 461 | stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif | | | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif bool (*func)(id, SEL, OFStream*, void*, size_t, OFException*) = (bool(*)(id, SEL, OFStream*, void*, size_t, OFException*)) [queueItem->_target methodForSelector: queueItem->_selector]; if (func(queueItem->_target, queueItem->_selector, stream, queueItem->_buffer, queueItem->_readLength, |
︙ | ︙ | |||
513 514 515 516 517 518 519 | stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif | | | | 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 | stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif bool (*func)(id, SEL, OFStream*, OFString*, OFException*) = (bool(*)(id, SEL, OFStream*, OFString*, OFException*)) [queueItem->_target methodForSelector: queueItem->_selector]; if (!func(queueItem->_target, queueItem->_selector, stream, line, exception)) { |
︙ | ︙ | |||
564 565 566 567 568 569 570 | removeStreamForReading: stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif | | | | 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 | removeStreamForReading: stream]; [_readQueues removeObjectForKey: stream]; } } } else { #endif bool (*func)(id, SEL, OFTCPSocket*, OFTCPSocket*, OFException*) = (bool(*)(id, SEL, OFTCPSocket*, OFTCPSocket*, OFException*)) [queueItem->_target methodForSelector: queueItem->_selector]; if (!func(queueItem->_target, queueItem->_selector, (OFTCPSocket*)stream, newSocket, exception)) { [queue removeListObject: listObject]; |
︙ | ︙ | |||
591 592 593 594 595 596 597 | #endif } else OF_ENSURE(0); } - (void)run { | | | 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 | #endif } else OF_ENSURE(0); } - (void)run { _running = true; while (_running) { void *pool = objc_autoreleasePoolPush(); OFDate *now = [OFDate date]; OFTimer *timer; OFDate *nextTimer; |
︙ | ︙ | |||
658 659 660 661 662 663 664 | objc_autoreleasePoolPop(pool); } } - (void)stop { | | | 658 659 660 661 662 663 664 665 666 667 668 | objc_autoreleasePoolPop(pool); } } - (void)stop { _running = false; [_streamObserver cancel]; } @end |