ObjFW  Diff

Differences From Artifact [eb19be5b1d]:

• File src/OFDataArray.m — part of check-in [ab270674db] at 2014-09-10 22:09:50 on branch trunk — Fix OFBigDataArray's initWithStringRepresentation: (user: js, size: 14408) [annotate] [blame] [check-ins using]

To Artifact [51267778f5]:

• File src/OFDataArray.m — part of check-in [46b89b1c8e] at 2015-01-03 20:42:30 on branch trunk — Introduce and use of_offset_t instead of off_t

  The reason for this is that some systems, for example Android, use
  32 bits for off_t while having size related fields like st_size as
  long long. (user: js, size: 14414) [annotate] [blame] [check-ins using]

148
149
150
151
152
153
154
155
156
157
158
159
160
161
162

#ifdef OF_HAVE_FILES
- initWithContentsOfFile: (OFString*)path
{
	@try {
		OFFile *file = [[OFFile alloc] initWithPath: path
						       mode: @"rb"];
		off_t size = [OFFile sizeOfFileAtPath: path];

		if (size > SIZE_MAX)
			@throw [OFOutOfRangeException exception];

		self = [self initWithItemSize: 1
				     capacity: (size_t)size];

|

148
149
150
151
152
153
154
155
156
157
158
159
160
161
162

#ifdef OF_HAVE_FILES
- initWithContentsOfFile: (OFString*)path
{
	@try {
		OFFile *file = [[OFFile alloc] initWithPath: path
						       mode: @"rb"];
		of_offset_t size = [OFFile sizeOfFileAtPath: path];

		if (size > SIZE_MAX)
			@throw [OFOutOfRangeException exception];

		self = [self initWithItemSize: 1
				     capacity: (size_t)size];