ObjFW  Check-in [d533c864ab]

Overview
Comment:Fix error checking on reading in OFFile.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d533c864abffb9343d3969907d8c7a86b25e1b49207c90d5603b5fe85c7d6a27
User & Date: js on 2011-10-05 22:39:21
Other Links: manifest | tags
Context
2011-10-05
23:26
Add OFProcess. check-in: 02ab9aa8a9 user: js tags: trunk
22:39
Fix error checking on reading in OFFile. check-in: d533c864ab user: js tags: trunk
2011-10-04
18:17
Move SOCKS5 support to OFTCPSocket. check-in: 48708f2435 user: js tags: trunk
Changes

Modified src/OFFile.m from [3604f250d5] to [d95eac9ee4].

634
635
636
637
638
639
640
641

642
643


644
645
646
647
648

649
650
651
652
653
654
655
634
635
636
637
638
639
640

641
642

643
644
645
646
647
648

649
650
651
652
653
654
655
656







-
+

-
+
+




-
+








	return atEndOfStream;
}

- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (void*)buffer
{
	size_t ret;
	ssize_t ret;

	if (fileDescriptor == -1 || atEndOfStream)
	if (fileDescriptor == -1 || atEndOfStream ||
	    (ret = read(fileDescriptor, buffer, length)) < 0)
		@throw [OFReadFailedException exceptionWithClass: isa
							  stream: self
						 requestedLength: length];

	if ((ret = read(fileDescriptor, buffer, length)) == 0)
	if (ret == 0)
		atEndOfStream = YES;

	return ret;
}

- (void)_writeNBytes: (size_t)length
	  fromBuffer: (const void*)buffer