Overview
Comment: | -[readNBytes:intoBuffer:] & -[writeNBytes:fromBuffer:] take a void* now. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8440a7045787847ec115649da7b279eb |
User & Date: | js on 2011-06-16 02:33:44 |
Other Links: | manifest | tags |
Context
2011-06-17
| ||
00:29 | Check for M_PI and define it if it's missing. check-in: b1fa976eaa user: js tags: trunk | |
2011-06-16
| ||
02:33 | -[readNBytes:intoBuffer:] & -[writeNBytes:fromBuffer:] take a void* now. check-in: 8440a70457 user: js tags: trunk | |
02:25 | Add -[setDimension:] to OFFloatVector. check-in: ef368d182c user: js tags: trunk | |
Changes
Modified src/OFFile.m from [e3972b8f3a] to [59b3e4b4fd].
︙ | ︙ | |||
600 601 602 603 604 605 606 | if (fileDescriptor == -1) return YES; return isAtEndOfStream; } - (size_t)_readNBytes: (size_t)length | | > | | 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 | if (fileDescriptor == -1) return YES; return isAtEndOfStream; } - (size_t)_readNBytes: (size_t)length intoBuffer: (void*)buffer { size_t ret; if (fileDescriptor == -1 || isAtEndOfStream) @throw [OFReadFailedException newWithClass: isa stream: self requestedLength: length]; if ((ret = read(fileDescriptor, buffer, length)) == 0) isAtEndOfStream = YES; return ret; } - (size_t)_writeNBytes: (size_t)length fromBuffer: (const void*)buffer { size_t ret; if (fileDescriptor == -1 || isAtEndOfStream || (ret = write(fileDescriptor, buffer, length)) < length) @throw [OFWriteFailedException newWithClass: isa stream: self |
︙ | ︙ |
Modified src/OFStream.h from [14891818f4] to [a6e5a685c5].
︙ | ︙ | |||
55 56 57 58 59 60 61 | * * \param buffer The buffer into which the data is read * \param length The length of the data that should be read at most. * The buffer MUST be at least this big! * \return The number of bytes read */ - (size_t)readNBytes: (size_t)size | | | | 55 56 57 58 59 60 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 | * * \param buffer The buffer into which the data is read * \param length The length of the data that should be read at most. * The buffer MUST be at least this big! * \return The number of bytes read */ - (size_t)readNBytes: (size_t)size intoBuffer: (void*)buffer; /** * Reads exactly length bytes from the stream into a buffer. Unlike * readNBytes:intoBuffer:, this method does not return when less than the * specified length has been read - instead, it waits until it got exactly length * bytes. * * WARNING: Only call this when you know that specified amount of data is * available! Otherwise you will get an exception! * * \param buffer The buffer into which the data is read * \param length The length of the data that should be read. * The buffer MUST be EXACTLY this big! */ - (void)readExactlyNBytes: (size_t)length intoBuffer: (void*)buffer; /** * Reads a uint8_t from the stream. * * WARNING: Only call this when you know that enough data is available! * Otherwise you will get an exception! * |
︙ | ︙ | |||
278 279 280 281 282 283 284 | * Writes from a buffer into the stream. * * \param buffer The buffer from which the data is written to the stream * \param length The length of the data that should be written * \return The number of bytes written */ - (size_t)writeNBytes: (size_t)length | | | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | * Writes from a buffer into the stream. * * \param buffer The buffer from which the data is written to the stream * \param length The length of the data that should be written * \return The number of bytes written */ - (size_t)writeNBytes: (size_t)length fromBuffer: (const void*)buffer; /** * Writes a uint8_t into the stream. * * \param int8 A uint8_t */ - (void)writeInt8: (uint8_t)int8; |
︙ | ︙ |
Modified src/OFStream.m from [168d0501c3] to [fbc06e6c49].
︙ | ︙ | |||
70 71 72 73 74 75 76 | - (BOOL)_isAtEndOfStream { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (size_t)_readNBytes: (size_t)length | | | | | 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 98 99 100 101 102 103 104 105 106 | - (BOOL)_isAtEndOfStream { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (size_t)_readNBytes: (size_t)length intoBuffer: (void*)buffer { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (size_t)_writeNBytes: (size_t)length fromBuffer: (const void*)buffer { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (BOOL)isAtEndOfStream { if (cache != NULL) return NO; return [self _isAtEndOfStream]; } - (size_t)readNBytes: (size_t)length intoBuffer: (void*)buffer { if (cache == NULL) return [self _readNBytes: length intoBuffer: buffer]; if (length >= cacheLength) { size_t ret = cacheLength; |
︙ | ︙ | |||
122 123 124 125 126 127 128 | cacheLength -= length; return length; } } - (void)readExactlyNBytes: (size_t)length | | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | cacheLength -= length; return length; } } - (void)readExactlyNBytes: (size_t)length intoBuffer: (void*)buffer { size_t readLength = 0; while (readLength < length) readLength += [self readNBytes: length - readLength intoBuffer: (char*)buffer + readLength]; } - (uint8_t)readInt8 { uint8_t ret; [self readExactlyNBytes: 1 |
︙ | ︙ | |||
622 623 624 625 626 627 628 | [self freeMemory: writeBuffer]; writeBuffer = NULL; writeBufferLength = 0; } - (size_t)writeNBytes: (size_t)length | | | 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 | [self freeMemory: writeBuffer]; writeBuffer = NULL; writeBufferLength = 0; } - (size_t)writeNBytes: (size_t)length fromBuffer: (const void*)buffer { if (!buffersWrites) return [self _writeNBytes: length fromBuffer: buffer]; else { writeBuffer = [self resizeMemory: writeBuffer toSize: writeBufferLength + length]; |
︙ | ︙ |
Modified src/OFStreamSocket.m from [a5c51abdbf] to [a6c16a5220].
︙ | ︙ | |||
62 63 64 65 66 67 68 | - (BOOL)_isAtEndOfStream { return isAtEndOfStream; } - (size_t)_readNBytes: (size_t)length | | | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | - (BOOL)_isAtEndOfStream { return isAtEndOfStream; } - (size_t)_readNBytes: (size_t)length intoBuffer: (void*)buffer { ssize_t ret; if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa socket: self]; |
︙ | ︙ | |||
97 98 99 100 101 102 103 | if (ret == 0) isAtEndOfStream = YES; return ret; } - (size_t)_writeNBytes: (size_t)length | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | if (ret == 0) isAtEndOfStream = YES; return ret; } - (size_t)_writeNBytes: (size_t)length fromBuffer: (const void*)buffer { ssize_t ret; if (sock == INVALID_SOCKET) @throw [OFNotConnectedException newWithClass: isa socket: self]; |
︙ | ︙ |