ObjFW: Diff

Differences From Artifact [ae15c876fb]:

File src/OFRunLoop.m — part of check-in [13a8f43898] at 2020-04-26 18:10:31 on branch trunk — Move accept and listen OF{TCP -> Stream}Socket (user: js, size: 37647) [annotate] [blame] [check-ins using]

To Artifact [964085efa2]:

File src/OFRunLoop.m — part of check-in [d7ddb3dbc7] at 2020-04-26 19:39:06 on branch trunk — Remove redundant arguments from blocks
Arguments that can just be captured by the block don't need to be
repeated as an argument. A lot of arguments passed to a delegate are
therefore not needed for a block. (user: js, size: 37506) [annotate] [blame] [check-ins using]

︙
438 439 440 441 442 443 444 ~~445~~ 446 447 448 449 450 451 452	438 439 440 441 442 443 444 445 446 447 448 449 450 451 452	- +	} @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) ~~return _block(~~object, _buffer,~~ length, exception);~~ return _block(length, exception); else { # endif if (![_delegate respondsToSelector: @selector(stream:didReadIntoBuffer:length:exception:)]) return false; return [_delegate stream: object
︙
486 487 488 489 490 491 492 ~~493~~ 494 495 496 497 498 499 500	486 487 488 489 490 491 492 493 494 495 496 497 498 499 500	- +	if (_readLength != _exactLength && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) { ~~if (!_block(~~object, _buffer,~~ _readLength, exception))~~ if (!_block(_readLength, exception)) return false; _readLength = 0; return true; } else { # endif if (![_delegate respondsToSelector:
︙
538 539 540 541 542 543 544 ~~545~~ 546 547 548 549 550 551 552	538 539 540 541 542 543 544 545 546 547 548 549 550 551 552	- +	} if (line == nil && ![object isAtEndOfStream] && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) ~~return _block(~~object,~~ line, exception);~~ return _block(line, exception); else { # endif if (![_delegate respondsToSelector: @selector(stream:didReadLine:exception:)]) return false; return [_delegate stream: object
︙
588 589 590 591 592 593 594 ~~595~~ 596 597 598 599 600 601 602	588 589 590 591 592 593 594 595 596 597 598 599 600 601 602	- +	_writtenLength += length; if (_writtenLength != dataLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) { ~~newData = _block(~~object,~~ _data, _writtenLength, exception);~~ newData = _block(_data, _writtenLength, exception); if (newData == nil) return false; oldData = _data; _data = [newData copy]; [oldData release];
︙
660 661 662 663 664 665 666 ~~667~~ ~~668~~ 669 670 671 672 673 674 675	660 661 662 663 664 665 666 667 668 669 670 671 672 673 674	- + -	_writtenLength += length; if (_writtenLength != cStringLength && exception == nil) return true; # ifdef OF_HAVE_BLOCKS if (_block != NULL) { ~~newString = _block(~~object, _string, _encod~~ing, _writtenLength,~~ newString = _block(_string, _writtenLength, exception); ~~exception);~~ if (newString == nil) return false; oldString = _string; _string = [newString copy]; [oldString release];
︙
768 769 770 771 772 773 774 ~~775~~ 776 777 778 779 ~~780~~ 781 782 783 784 785 786 787	767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786	- + - +	exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) { if ([object isKindOfClass: [OFStreamSocket class]]) return ((of_stream_socket_async_accept_block_t) ~~_block)(~~object,~~ acceptedSocket, exception);~~ _block)(acceptedSocket, exception); else if ([object isKindOfClass: [OFSequencedPacketSocket class]]) return ((of_sequenced_packet_socket_async_accept_block_t) ~~_block)(~~object,~~ acceptedSocket, exception);~~ _block)(acceptedSocket, exception); else OF_ENSURE(0); } else { # endif if (![_delegate respondsToSelector: @selector(socket:didAcceptSocket:exception:)]) return false;
︙
818 819 820 821 822 823 824 ~~825~~ 826 827 828 829 830 831 832	817 818 819 820 821 822 823 824 825 826 827 828 829 830 831	- +	} @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) ~~return _block(~~object, _buffer,~~ length, &address, exception);~~ return _block(length, &address, exception); else { # endif if (![_delegate respondsToSelector: @selector( socket:didReceiveIntoBuffer:length:sender:exception:)]) return false; return [_delegate socket: object
︙
861 862 863 864 865 866 867 ~~868~~ 869 870 871 872 873 874 875	860 861 862 863 864 865 866 867 868 869 870 871 872 873 874	- +	receiver: &_receiver]; } @catch (id e) { exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) { ~~newData = _block(~~object,~~ _data, &_receiver, exception);~~ newData = _block(_data, &_receiver, exception); if (newData == nil) return false; oldData = _data; _data = [newData copy]; [oldData release];
︙
922 923 924 925 926 927 928 ~~929~~ 930 931 932 933 934 935 936	921 922 923 924 925 926 927 928 929 930 931 932 933 934 935	- +	} @catch (id e) { length = 0; exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) ~~return _block(~~object, _buffer,~~ length, exception);~~ return _block(length, exception); else { # endif if (![_delegate respondsToSelector: @selector( socket:didReceiveIntoBuffer:length:exception:)]) return false; return [_delegate socket: object
︙
963 964 965 966 967 968 969 ~~970~~ 971 972 973 974 975 976 977	962 963 964 965 966 967 968 969 970 971 972 973 974 975 976	- +	length: _data.count * _data.itemSize]; } @catch (id e) { exception = e; } # ifdef OF_HAVE_BLOCKS if (_block != NULL) { ~~newData = _block(~~object,~~ _data, exception);~~ newData = _block(_data, exception); if (newData == nil) return false; oldData = _data; _data = [newData copy]; [oldData release];
︙

ObjFW Diff

Differences From Artifact [ae15c876fb]:

To Artifact [964085efa2]: