ObjFW  Diff

Differences From Artifact [164c881033]:

To Artifact [3e41bb8976]:


93
94
95
96
97
98
99

100

101
102
103
104
105
106



107
108
109
110
111
112
113
114
115

116


117
118
119
120
121
122
123
93
94
95
96
97
98
99
100

101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120

121
122
123
124
125
126
127
128
129







+
-
+






+
+
+









+
-
+
+







	}

	return self;
}

- free
{
	if (fp != NULL)
	fclose(fp);
		fclose(fp);

	return [super free];
}

- (BOOL)atEndOfFile
{
	if (fp == NULL)
		return YES;

	return (feof(fp) == 0 ? NO : YES);
}

- (size_t)readNItems: (size_t)nitems
	      ofSize: (size_t)size
	  intoBuffer: (char*)buf
{
	size_t ret;

	if (fp == NULL || feof(fp) ||
	if ((ret = fread(buf, size, nitems, fp)) == 0 && !feof(fp))
	    ((ret = fread(buf, size, nitems, fp)) == 0 &&
	    size != 0 && nitems != 0 && !feof(fp)))
		@throw [OFReadFailedException newWithClass: isa
						   andSize: size
						 andNItems: nitems];

	return ret;
}

131
132
133
134
135
136
137

138
139


140
141
142
143
144
145
146
137
138
139
140
141
142
143
144


145
146
147
148
149
150
151
152
153







+
-
-
+
+








- (size_t)writeNItems: (size_t)nitems
	       ofSize: (size_t)size
	   fromBuffer: (const char*)buf
{
	size_t ret;

	if (fp == NULL || feof(fp) ||
	if ((ret = fwrite(buf, size, nitems, fp)) == 0 &&
	    size != 0 && nitems != 0)
	    ((ret = fwrite(buf, size, nitems, fp)) < nitems &&
	    size != 0 && nitems != 0))
		@throw [OFWriteFailedException newWithClass: isa
						    andSize: size
						  andNItems: nitems];

	return ret;
}