ObjFW  Check-in [5e214166e1]

Overview
Comment:Fix conflicting declarations in tests.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5e214166e122d8f99da01fe1a887c9d84d841a855f4a2449e8a1b66091b10810
User & Date: js on 2011-09-20 21:57:14
Other Links: manifest | tags
Context
2011-09-21
20:11
More precision for microseconds. check-in: 49ec1216cd user: js tags: trunk
2011-09-20
21:57
Fix conflicting declarations in tests. check-in: 5e214166e1 user: js tags: trunk
19:06
Remove useless imports. check-in: 1af1677350 user: js tags: trunk
Changes

Modified tests/OFStreamTests.m from [f7dd955202] to [69fba112b7].

35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
@implementation StreamTester
- (BOOL)_isAtEndOfStream
{
	return (state > 1 ? YES : NO);
}

- (size_t)_readNBytes: (size_t)size
	   intoBuffer: (char*)buf
{
	switch (state) {
	case 0:
		if (size < 1)
			return 0;

		memcpy(buf, "f", 1);

		state++;
		return 1;
	case 1:
		if (size < of_pagesize)
			return 0;

		memcpy(buf, "oo\n", 3);
		memset(buf + 3, 'X', of_pagesize - 3);

		state++;
		return of_pagesize;
	}

	return 0;
}







|






|







|
|







35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
@implementation StreamTester
- (BOOL)_isAtEndOfStream
{
	return (state > 1 ? YES : NO);
}

- (size_t)_readNBytes: (size_t)size
	   intoBuffer: (void*)buffer
{
	switch (state) {
	case 0:
		if (size < 1)
			return 0;

		memcpy(buffer, "f", 1);

		state++;
		return 1;
	case 1:
		if (size < of_pagesize)
			return 0;

		memcpy(buffer, "oo\n", 3);
		memset((char*)buffer + 3, 'X', of_pagesize - 3);

		state++;
		return of_pagesize;
	}

	return 0;
}