ObjOpenSSL  Check-in [7714264163]

Overview
Comment:Fix type conflict.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 7714264163dda5176f054db5a39526b8ffe85460eaadb4bad91493f01b45d9cc
User & Date: js on 2011-09-22 13:52:17
Other Links: manifest | tags
Context
2011-09-22
23:28
Adjust to recent ObjFW changes. check-in: 82f79803e7 user: js tags: trunk
13:52
Fix type conflict. check-in: 7714264163 user: js tags: trunk
2011-09-19
16:37
Adjust to recent ObjFW changes. check-in: 58b7b70ed2 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [3ce831d2bc] to [5e6d395089].

︙︙
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196

{
	SSL_shutdown(ssl);

	[super close];
}

- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (char*)buffer
{
	ssize_t ret;

	if (length > INT_MAX)
		@throw [OFOutOfRangeException newWithClass: isa];

	if (sock == INVALID_SOCKET)








|








182
183
184
185
186
187
188
189
190
191
192
193
194
195
196

{
	SSL_shutdown(ssl);

	[super close];
}

- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (void*)buffer
{
	ssize_t ret;

	if (length > INT_MAX)
		@throw [OFOutOfRangeException newWithClass: isa];

	if (sock == INVALID_SOCKET)
︙︙
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234

	if (ret == 0)
		atEndOfStream = YES;

	return ret;
}

- (void)_writeNBytes: (size_t)length
	  fromBuffer: (const char*)buffer
{
	if (length > INT_MAX)
		@throw [OFOutOfRangeException newWithClass: isa];

	if (sock == INVALID_SOCKET)
		@throw [OFNotConnectedException newWithClass: isa
						      socket: self];








|








220
221
222
223
224
225
226
227
228
229
230
231
232
233
234

	if (ret == 0)
		atEndOfStream = YES;

	return ret;
}

- (void)_writeNBytes: (size_t)length
	  fromBuffer: (const void*)buffer
{
	if (length > INT_MAX)
		@throw [OFOutOfRangeException newWithClass: isa];

	if (sock == INVALID_SOCKET)
		@throw [OFNotConnectedException newWithClass: isa
						      socket: self];
︙︙