Overview
| Comment: | Remove unneeded arguments from blocks |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b489d6188d62e37548a7e0124a7d3389 |
| User & Date: | js on 2022-06-12 08:50:35 |
| Other Links: | manifest | tags |
Context
|
2022-06-12
| ||
| 20:25 | README.md: Add "Thanks" section (check-in: a0e4be5fb9 user: js tags: trunk) | |
| 08:50 | Remove unneeded arguments from blocks (check-in: b489d6188d user: js tags: trunk) | |
| 06:33 | OFSystemInfo: Change type of ObjFW version (check-in: 811d9c8378 user: js tags: trunk) | |
Changes
Modified src/OFDatagramSocket.h from [22b01704fe] to [c9d6b20376].
| ︙ | ︙ | |||
37 38 39 40 41 42 43 |
*/
typedef bool (^OFDatagramSocketAsyncReceiveBlock)(size_t length,
const OFSocketAddress *_Nonnull sender, id _Nullable exception);
/**
* @brief A block which is called when a packet has been sent.
*
| < < < | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
*/
typedef bool (^OFDatagramSocketAsyncReceiveBlock)(size_t length,
const OFSocketAddress *_Nonnull sender, id _Nullable exception);
/**
* @brief A block which is called when a packet has been sent.
*
* @param exception An exception which occurred while reading or `nil` on
* success
* @return The data to repeat the send with or nil if it should not repeat
*/
typedef OFData *_Nullable (^OFDatagramSocketAsyncSendDataBlock)(
id _Nullable exception);
#endif
/**
* @protocol OFDatagramSocketDelegate OFDatagramSocket.h \
* ObjFW/OFDatagramSocket.h
*
|
| ︙ | ︙ |
Modified src/OFRunLoop.m from [6aa5ca009f] to [e671b17f7b].
| ︙ | ︙ | |||
586 587 588 589 590 591 592 |
OFEnsure(_writtenLength <= dataLength);
if (_writtenLength != dataLength && exception == nil)
return true;
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
| | | 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 |
OFEnsure(_writtenLength <= dataLength);
if (_writtenLength != dataLength && exception == nil)
return true;
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
newData = _block(_writtenLength, exception);
if (newData == nil)
return false;
oldData = _data;
_data = [newData copy];
[oldData release];
|
| ︙ | ︙ | |||
663 664 665 666 667 668 669 |
OFEnsure(_writtenLength <= cStringLength);
if (_writtenLength != cStringLength && exception == nil)
return true;
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
| | | 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 |
OFEnsure(_writtenLength <= cStringLength);
if (_writtenLength != cStringLength && exception == nil)
return true;
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
newString = _block(_writtenLength, exception);
if (newString == nil)
return false;
oldString = _string;
_string = [newString copy];
[oldString release];
|
| ︙ | ︙ | |||
857 858 859 860 861 862 863 |
receiver: &_receiver];
} @catch (id e) {
exception = e;
}
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
| | | 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 |
receiver: &_receiver];
} @catch (id e) {
exception = e;
}
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
newData = _block(exception);
if (newData == nil)
return false;
oldData = _data;
_data = [newData copy];
[oldData release];
|
| ︙ | ︙ | |||
958 959 960 961 962 963 964 |
length: _data.count * _data.itemSize];
} @catch (id e) {
exception = e;
}
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
| | | 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 |
length: _data.count * _data.itemSize];
} @catch (id e) {
exception = e;
}
# ifdef OF_HAVE_BLOCKS
if (_block != NULL) {
newData = _block(exception);
if (newData == nil)
return false;
oldData = _data;
_data = [newData copy];
[oldData release];
|
| ︙ | ︙ |
Modified src/OFSequencedPacketSocket.h from [4d7aaf9b3b] to [c4199b3715].
| ︙ | ︙ | |||
36 37 38 39 40 41 42 |
*/
typedef bool (^OFSequencedPacketSocketAsyncReceiveBlock)(size_t length,
id _Nullable exception);
/**
* @brief A block which is called when a packet has been sent.
*
| < | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
*/
typedef bool (^OFSequencedPacketSocketAsyncReceiveBlock)(size_t length,
id _Nullable exception);
/**
* @brief A block which is called when a packet has been sent.
*
* @param exception An exception which occurred while reading or `nil` on
* success
* @return The data to repeat the send with or nil if it should not repeat
*/
typedef OFData *_Nullable (^OFSequencedPacketSocketAsyncSendDataBlock)(
id _Nullable exception);
/**
* @brief A block which is called when the socket accepted a connection.
*
* @param acceptedSocket The socket which has been accepted
* @param exception An exception which occurred while accepting the socket or
* `nil` on success
|
| ︙ | ︙ |
Modified src/OFStream.h from [b3e894dafd] to [2b820d15bb].
| ︙ | ︙ | |||
61 62 63 64 65 66 67 |
typedef bool (^OFStreamAsyncReadLineBlock)(OFString *_Nullable line,
id _Nullable exception);
/**
* @brief A block which is called when data was written asynchronously to a
* stream.
*
| < | | < | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 |
typedef bool (^OFStreamAsyncReadLineBlock)(OFString *_Nullable line,
id _Nullable exception);
/**
* @brief A block which is called when data was written asynchronously to a
* stream.
*
* @param bytesWritten The number of bytes which have been written. This
* matches the length of the specified data on the
* asynchronous write if no exception was encountered.
* @param exception An exception which occurred while writing or `nil` on
* success
* @return The data to repeat the write with or nil if it should not repeat
*/
typedef OFData *_Nullable (^OFStreamAsyncWriteDataBlock)(size_t bytesWritten,
id _Nullable exception);
/**
* @brief A block which is called when a string was written asynchronously to a
* stream.
*
* @param bytesWritten The number of bytes which have been written. This
* matches the length of the specified data on the
* asynchronous write if no exception was encountered.
* @param exception An exception which occurred while writing or `nil` on
* success
* @return The string to repeat the write with or nil if it should not repeat
*/
typedef OFString *_Nullable (^OFStreamAsyncWriteStringBlock)(
size_t bytesWritten, id _Nullable exception);
#endif
/**
* @protocol OFStreamDelegate OFStream.h ObjFW/OFStream.h
*
* A delegate for OFStream.
*/
|
| ︙ | ︙ |