@@ -72,18 +72,18 @@ @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (size_t)_readNBytes: (size_t)length - intoBuffer: (char*)buffer + intoBuffer: (void*)buffer { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - (size_t)_writeNBytes: (size_t)length - fromBuffer: (const char*)buffer + fromBuffer: (const void*)buffer { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } @@ -94,11 +94,11 @@ return [self _isAtEndOfStream]; } - (size_t)readNBytes: (size_t)length - intoBuffer: (char*)buffer + intoBuffer: (void*)buffer { if (cache == NULL) return [self _readNBytes: length intoBuffer: buffer]; @@ -124,17 +124,17 @@ return length; } } - (void)readExactlyNBytes: (size_t)length - intoBuffer: (char*)buffer + intoBuffer: (void*)buffer { size_t readLength = 0; while (readLength < length) readLength += [self readNBytes: length - readLength - intoBuffer: buffer + readLength]; + intoBuffer: (char*)buffer + readLength]; } - (uint8_t)readInt8 { uint8_t ret; @@ -624,11 +624,11 @@ writeBuffer = NULL; writeBufferLength = 0; } - (size_t)writeNBytes: (size_t)length - fromBuffer: (const char*)buffer + fromBuffer: (const void*)buffer { if (!buffersWrites) return [self _writeNBytes: length fromBuffer: buffer]; else {