ObjFW  Check-in [eb207e5ecd]

Overview
Comment:Always do nothing if OF_BLOCK_BYREF_CALLER is set.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: eb207e5ecd451acdf152de225a5df60ff1186aec914570a9d8252fc75eabe533
User & Date: js on 2011-07-14 23:04:39
Other Links: manifest | tags
Context
2011-07-14
23:06
Fix reference counting for blocks. check-in: 5b3aebb65a user: js tags: trunk
23:04
Always do nothing if OF_BLOCK_BYREF_CALLER is set. check-in: eb207e5ecd user: js tags: trunk
22:56
Fix missing return. check-in: 7455987d6e user: js tags: trunk
Changes

Modified src/OFBlock.m from [467fbfe40b] to [feff30d170].

265
266
267
268
269
270
271



272
273
274
275
276
277
278
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281







+
+
+







_Block_object_assign(void *dst_, const void *src_, const int flags_)
{
	int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK |
	    OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF);

	if (src_ == NULL)
		return;

	if (flags_ & OF_BLOCK_BYREF_CALLER)
		return;

	switch (flags) {
	case OF_BLOCK_FIELD_IS_BLOCK:
		*(of_block_literal_t**)dst_ = _Block_copy(src_);
		break;
	case OF_BLOCK_FIELD_IS_OBJECT:
		*(id*)dst_ = [(id)src_ retain];
308
309
310
311
312
313
314



315
316
317
318
319
320
321
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327







+
+
+







_Block_object_dispose(const void *obj_, const int flags_)
{
	const int flags = flags_ & (OF_BLOCK_FIELD_IS_BLOCK |
	    OF_BLOCK_FIELD_IS_OBJECT | OF_BLOCK_FIELD_IS_BYREF);

	if (obj_ == NULL)
		return;

	if (flags_ & OF_BLOCK_BYREF_CALLER)
		return;

	switch (flags) {
	case OF_BLOCK_FIELD_IS_BLOCK:
		_Block_release(obj_);
		break;
	case OF_BLOCK_FIELD_IS_OBJECT:
		[(id)obj_ release];