ObjFW  Check-in [07d8cd5590]

Overview
Comment:OFTarArchiveEntry: Fix type, add an explicit cast
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 07d8cd5590db1d31ec1743f13b4e274f932e286e0b22176cea8e9f87ef70cd0f
User & Date: js on 2016-05-28 09:48:08
Other Links: manifest | tags
Context
2016-05-28
09:54
OFZIP: Define S_IRWXG / S_IRWXO in OFZIP.h check-in: 200d385059 user: js tags: trunk
09:48
OFTarArchiveEntry: Fix type, add an explicit cast check-in: 07d8cd5590 user: js tags: trunk
2016-05-22
21:30
OFZIP: Add an option to manually specify the type check-in: ea478372d8 user: js tags: trunk
Changes

Modified src/OFTarArchiveEntry.m from [7c3c0e4a34] to [d10ff12b41].

34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
			length = i;

	return [OFString stringWithUTF8String: buffer
				       length: length];
}

static uintmax_t
octalValueFromBuffer(const char *buffer, size_t length, size_t max)
{
	uintmax_t value = [stringFromBuffer(buffer, length) octalValue];

	if (value > max)
		@throw [OFOutOfRangeException exception];

	return value;







|







34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
			length = i;

	return [OFString stringWithUTF8String: buffer
				       length: length];
}

static uintmax_t
octalValueFromBuffer(const char *buffer, size_t length, uintmax_t max)
{
	uintmax_t value = [stringFromBuffer(buffer, length) octalValue];

	if (value > max)
		@throw [OFOutOfRangeException exception];

	return value;
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
		[_stream readIntoBuffer: buffer
			    exactLength: 512];
		_toRead -= 512;
	}

	if (_toRead > 0) {
		[_stream readIntoBuffer: buffer
			    exactLength: _toRead];
		_toRead = 0;
	}

	if (_size % 512 != 0)
		[_stream readIntoBuffer: buffer
			    exactLength: 512 - (_size % 512)];
}
@end







|








143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
		[_stream readIntoBuffer: buffer
			    exactLength: 512];
		_toRead -= 512;
	}

	if (_toRead > 0) {
		[_stream readIntoBuffer: buffer
			    exactLength: (size_t)_toRead];
		_toRead = 0;
	}

	if (_size % 512 != 0)
		[_stream readIntoBuffer: buffer
			    exactLength: 512 - (_size % 512)];
}
@end