ObjFW  Check-in [a427cfc86a]

Overview
Comment:Clean up OF_ENSURE() vs. assert() a little.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a427cfc86aa941c303e72c259a6d177f557ad44bfcece1d5b4e7d17bf74a4936
User & Date: js on 2013-10-29 23:46:33
Other Links: manifest | tags
Context
2013-10-30
00:09
OFStringTests: Fix a path test on Win32. check-in: 7561b9244e user: js tags: trunk
2013-10-29
23:46
Clean up OF_ENSURE() vs. assert() a little. check-in: a427cfc86a user: js tags: trunk
23:37
OFDeflateStream: Get rid of stupid GCC warnings. check-in: 2b11bca0d1 user: js tags: trunk
Changes

Modified src/OFDeflateStream.m from [66b4a19144] to [b46dd90f88].

730
731
732
733
734
735
736

737

738
739
740
741
742
743
744
730
731
732
733
734
735
736
737

738
739
740
741
742
743
744
745







+
-
+







			CTX.state = AWAIT_DISTANCE;
		}

		break;
#undef CTX
	}

	/* Get rid of a warning, never reached anyway */
	assert(0);
	OF_ENSURE(0);
}

- (bool)lowlevelIsAtEndOfStream
{
	return _atEndOfStream;
}
@end

Modified src/OFRunLoop.m from [ece7ab01e9] to [cac020d21b].

387
388
389
390
391
392
393
394

395
396
397
398
399
400
401
387
388
389
390
391
392
393

394
395
396
397
398
399
400
401







-
+








#ifdef OF_HAVE_SOCKETS
- (void)streamIsReadyForReading: (OFStream*)stream
{
	OFList *queue = [_readQueues objectForKey: stream];
	of_list_object_t *listObject;

	OF_ENSURE(queue != nil);
	assert(queue != nil);

	listObject = [queue firstListObject];

	if ([listObject->object isKindOfClass:
	    [OFRunLoop_ReadQueueItem class]]) {
		OFRunLoop_ReadQueueItem *queueItem = listObject->object;
		size_t length;
610
611
612
613
614
615
616
617

618
619
620
621
622
623
624
610
611
612
613
614
615
616

617
618
619
620
621
622
623
624







-
+







					    removeObjectForKey: stream];
				}
			}
# ifdef OF_HAVE_BLOCKS
		}
# endif
	} else
		OF_ENSURE(0);
		assert(0);
}
#endif

- (void)run
{
	_running = true;