ObjIRC  Check-in [e398c849f2]

Overview
Comment:Adjust to recent ObjFW changes.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: e398c849f23f68c426b4172cdfde8ff21469414133abf4e87c12b3a143626096
User & Date: js on 2011-09-22 23:39:02
Other Links: manifest | tags
Context
2011-10-05
19:26
Fix adding channels to the list of joined channels. check-in: a515b09ef0 user: js tags: trunk
2011-09-22
23:39
Adjust to recent ObjFW changes. check-in: e398c849f2 user: js tags: trunk
2011-09-14
23:38
Make non-blocking processing possible. check-in: 8b48789571 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/IRCConnection.m from [1078b7859d] to [5c27b6dee8].

︙︙
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183

	OFString *line;
	OFArray *split;
	OFString *action = nil;

	@try {
		line = [sock tryReadLine];
	} @catch (OFInvalidEncodingException *e) {
		[e dealloc];
		line = [sock tryReadLineWithEncoding:
		    OF_STRING_ENCODING_WINDOWS_1252];
	}

	if (line == nil)
		return;









<








169
170
171
172
173
174
175

176
177
178
179
180
181
182

	OFString *line;
	OFArray *split;
	OFString *action = nil;

	@try {
		line = [sock tryReadLine];
	} @catch (OFInvalidEncodingException *e) {

		line = [sock tryReadLineWithEncoding:
		    OF_STRING_ENCODING_WINDOWS_1252];
	}

	if (line == nil)
		return;
︙︙

Modified src/IRCUser.m from [a1343091ca] to [3f5ec0521c].

︙︙
44
45
46
47
48
49
50
51
52
53
54
55

56
57
58
59
60
61

62
63
64
65
66
67
68

	self = [super init];

	@try {
		char *tmp;

		if ((tmp2 = strdup([string UTF8String])) == NULL)
			@throw [OFOutOfMemoryException
			     newWithClass: isa
			    requestedSize: [string UTF8StringLength]];

		if ((tmp = strchr(tmp2, '@')) == NULL)
			@throw [OFInvalidFormatException newWithClass: isa];


		*tmp = '\0';
		hostname = [[OFString alloc] initWithUTF8String: tmp + 1];

		if ((tmp = strchr(tmp2, '!')) == NULL)
			@throw [OFInvalidFormatException newWithClass: isa];


		*tmp = '\0';
		username = [[OFString alloc] initWithUTF8String: tmp + 1];

		nickname = [[OFString alloc] initWithUTF8String: tmp2];
	} @catch (id e) {
		[self release];








|
|


|
>





|
>








44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

	self = [super init];

	@try {
		char *tmp;

		if ((tmp2 = strdup([string UTF8String])) == NULL)
			@throw [OFOutOfMemoryException
			     exceptionWithClass: isa
				  requestedSize: [string UTF8StringLength]];

		if ((tmp = strchr(tmp2, '@')) == NULL)
			@throw [OFInvalidFormatException
			    exceptionWithClass: isa];

		*tmp = '\0';
		hostname = [[OFString alloc] initWithUTF8String: tmp + 1];

		if ((tmp = strchr(tmp2, '!')) == NULL)
			@throw [OFInvalidFormatException
			    exceptionWithClass: isa];

		*tmp = '\0';
		username = [[OFString alloc] initWithUTF8String: tmp + 1];

		nickname = [[OFString alloc] initWithUTF8String: tmp2];
	} @catch (id e) {
		[self release];
︙︙