Differences From Artifact [401460f5bb]:
- File
src/OFStream.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: 30508) [annotate] [blame] [check-ins using]
To Artifact [f3e5357ad2]:
- File src/OFStream.m — part of check-in [590c377d8a] at 2013-04-26 19:42:52 on branch trunk — Make it possible to disable sockets. (user: js, size: 30602) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
size_t readLength = 0;
while (readLength < length)
readLength += [self readIntoBuffer: (char*)buffer + readLength
length: length - readLength];
}
- (void)asyncReadIntoBuffer: (void*)buffer
length: (size_t)length
target: (id)target
selector: (SEL)selector
{
[OFRunLoop OF_addAsyncReadForStream: self
buffer: buffer
| > | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 |
size_t readLength = 0;
while (readLength < length)
readLength += [self readIntoBuffer: (char*)buffer + readLength
length: length - readLength];
}
#ifdef OF_HAVE_SOCKETS
- (void)asyncReadIntoBuffer: (void*)buffer
length: (size_t)length
target: (id)target
selector: (SEL)selector
{
[OFRunLoop OF_addAsyncReadForStream: self
buffer: buffer
|
| ︙ | ︙ | |||
168 169 170 171 172 173 174 | [OFRunLoop OF_addAsyncReadForStream: self buffer: buffer exactLength: length target: target selector: selector]; } | | > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 |
[OFRunLoop OF_addAsyncReadForStream: self
buffer: buffer
exactLength: length
target: target
selector: selector];
}
# ifdef OF_HAVE_BLOCKS
- (void)asyncReadIntoBuffer: (void*)buffer
length: (size_t)length
block: (of_stream_async_read_block_t)block
{
[OFRunLoop OF_addAsyncReadForStream: self
buffer: buffer
length: length
block: block];
}
- (void)asyncReadIntoBuffer: (void*)buffer
exactLength: (size_t)length
block: (of_stream_async_read_block_t)block
{
[OFRunLoop OF_addAsyncReadForStream: self
buffer: buffer
exactLength: length
block: block];
}
# endif
#endif
- (uint8_t)readInt8
{
uint8_t ret;
[self readIntoBuffer: (char*)&ret
|
| ︙ | ︙ | |||
729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 |
while ((line = [self tryReadLineWithEncoding: encoding]) == nil)
if ([self isAtEndOfStream])
return nil;
return line;
}
- (void)asyncReadLineWithTarget: (id)target
selector: (SEL)selector
{
[self asyncReadLineWithEncoding: OF_STRING_ENCODING_UTF_8
target: target
selector: selector];
}
- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
target: (id)target
selector: (SEL)selector
{
[OFRunLoop OF_addAsyncReadLineForStream: self
encoding: encoding
target: target
selector: selector];
}
| > | > | 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 |
while ((line = [self tryReadLineWithEncoding: encoding]) == nil)
if ([self isAtEndOfStream])
return nil;
return line;
}
#ifdef OF_HAVE_SOCKETS
- (void)asyncReadLineWithTarget: (id)target
selector: (SEL)selector
{
[self asyncReadLineWithEncoding: OF_STRING_ENCODING_UTF_8
target: target
selector: selector];
}
- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
target: (id)target
selector: (SEL)selector
{
[OFRunLoop OF_addAsyncReadLineForStream: self
encoding: encoding
target: target
selector: selector];
}
# ifdef OF_HAVE_BLOCKS
- (void)asyncReadLineWithBlock: (of_stream_async_read_line_block_t)block
{
[self asyncReadLineWithEncoding: OF_STRING_ENCODING_UTF_8
block: block];
}
- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
block: (of_stream_async_read_line_block_t)block
{
[OFRunLoop OF_addAsyncReadLineForStream: self
encoding: encoding
block: block];
}
# endif
#endif
- (OFString*)tryReadLine
{
return [self tryReadLineWithEncoding: OF_STRING_ENCODING_UTF_8];
}
|
| ︙ | ︙ | |||
1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 |
- (int)fileDescriptorForWriting
{
[self doesNotRecognizeSelector: _cmd];
abort();
}
- (void)cancelAsyncRequests
{
[OFRunLoop OF_cancelAsyncRequestsForStream: self];
}
- (void)close
{
[self doesNotRecognizeSelector: _cmd];
abort();
}
- (bool)OF_isWaitingForDelimiter
{
return _waitingForDelimiter;
}
@end
| > > | 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 |
- (int)fileDescriptorForWriting
{
[self doesNotRecognizeSelector: _cmd];
abort();
}
#ifdef OF_HAVE_SOCKETS
- (void)cancelAsyncRequests
{
[OFRunLoop OF_cancelAsyncRequestsForStream: self];
}
#endif
- (void)close
{
[self doesNotRecognizeSelector: _cmd];
abort();
}
- (bool)OF_isWaitingForDelimiter
{
return _waitingForDelimiter;
}
@end
|