ObjFW  Diff

Differences From Artifact [8a2ef1e3cd]:

To Artifact [cbc64c1780]:


205
206
207
208
209
210
211
212
213
214



215
216
217
218
219
220
221
222
205
206
207
208
209
210
211



212
213
214

215
216
217
218
219
220
221







-
-
-
+
+
+
-







	  intoBuffer: (uint8_t*)buf
{
	ssize_t ret;

	if (sock < 0) 
		@throw [OFNotConnectedException newWithObject: self];

	if ((ret = recv(sock, buf, size, 0)) < 0) {
		/* FIXME: Throw exception */
		return 0;
	if ((ret = recv(sock, buf, size, 0)) < 0)
		@throw [OFReadFailedException newWithObject: self
						    andSize: size];
	}

	/* This is safe, as we already checked < 0 */
	return ret;
}

- (uint8_t*)readNBytes: (size_t)size
{
242
243
244
245
246
247
248
249
250
251



252
253
254
255
256
257
258
259
241
242
243
244
245
246
247



248
249
250

251
252
253
254
255
256
257







-
-
-
+
+
+
-







	   fromBuffer: (const uint8_t*)buf
{
	ssize_t ret;

	if (sock < 0) 
		@throw [OFNotConnectedException newWithObject: self];

	if ((ret = send(sock, buf, size, 0)) < 0) {
		/* FIXME: Throw exception */
		return 0;
	if ((ret = send(sock, buf, size, 0)) < 0)
		@throw [OFWriteFailedException newWithObject: self
						     andSize: size];
	}

	/* This is safe, as we already checked < 0 */
	return ret;
}

- (size_t)writeCString: (const char*)str
{