ObjIRC  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [1b330b60e2]:

To Artifact [6c1d6f5f3a]:

︙
24
25
26
27
28
29
30


31
32
33
34
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
66
67
68
69
70

24
25
26
27
28
29
30
31
32
33
34
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
66
67
68
69
70
71








+
+



-
















-
+




-
+






-
+








#include <string.h>

#import <ObjFW/OFString.h>

#import <ObjFW/OFInvalidFormatException.h>
#import <ObjFW/OFOutOfMemoryException.h>

#import <ObjFW/macros.h>

#import "IRCUser.h"

@implementation IRCUser
@synthesize username, nickname, hostname;
+ IRCUserWithString: (OFString*)string
{
	return [[[self alloc] initWithString: string] autorelease];
}

- initWithString: (OFString*)string
{
	char *tmp2 = NULL;

	self = [super init];

	@try {
		char *tmp;

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

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

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

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

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

		nickname = [[OFString alloc] initWithUTF8String: tmp2];
	} @catch (id e) {
		[self release];
︙
81
82
83
84
85
86
87















88
89
90
91
92
93
94
95
96
97
98
99

82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+













{
	[nickname release];
	[username release];
	[hostname release];

	[super dealloc];
}

- (OFString*)username
{
	OF_GETTER(username, YES)
}

- (OFString*)nickname
{
	OF_GETTER(nickname, YES)
}

- (OFString*)hostname
{
	OF_GETTER(hostname, YES)
}

- copy
{
	return [self retain];
}

- (OFString*)description
{
	return [OFString stringWithFormat: @"%@!%@@%@",
					   nickname, username, hostname];
}
@end