ObjFW  Diff

Differences From Artifact [3007afbd2c]:

• File src/OFHTTPClient.m — part of check-in [8d2a5052fd] at 2014-01-25 17:39:13 on branch trunk — Generalize stream / socket related exceptions

  This is in preparation for adding UDP sockets, as UDP sockets and TCP
  sockets have no common superclass, as one is stream-oriented while the
  other is packet-oriented.

  Read and write exceptions are for any object now, as they are useful for
  a lot more than just for streams, while the others (bind, listen, etc.)
  are for any socket now (the type is id in this case, though, as there is
  no common superclass). (user: js, size: 15246) [annotate] [blame] [check-ins using]

To Artifact [26d3992686]:

• File src/OFHTTPClient.m — part of check-in [acc999a75e] at 2014-05-31 17:57:21 on branch trunk — OFStream: Add -[hasDataInReadBuffer].

  This replaces -[numberOfBytesInReadBuffer], as it's not always known how
  many bytes there are exactly and thus the number would often be wrong
  (e.g. because data is compressed). (user: js, size: 15224) [annotate] [blame] [check-ins using]

234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251

}

- (int)fileDescriptorForReading
{
	return [_socket fileDescriptorForReading];
}

- (size_t)numberOfBytesInReadBuffer
{
	return [super numberOfBytesInReadBuffer] +
	    [_socket numberOfBytesInReadBuffer];
}

- (void)close
{
	[_socket release];
	_socket = nil;
}

|

|
<

234
235
236
237
238
239
240
241
242
243

244
245
246
247
248
249
250

}

- (int)fileDescriptorForReading
{
	return [_socket fileDescriptorForReading];
}

- (bool)hasDataInReadBuffer
{
	return ([super hasDataInReadBuffer] || [_socket hasDataInReadBuffer]);

}

- (void)close
{
	[_socket release];
	_socket = nil;
}