ObjIRC  Diff

Differences From Artifact [9f03255a1e]:

To Artifact [a1343091ca]:


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
72
73
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
72
73







-
+

-
+


-
+








-
+


-
+





-
+





-
+

-
+







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

#import "IRCUser.h"

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

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

	self = [super init];

	@try {
		char *tmp;

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

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

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

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

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

		nickname = [[OFString alloc] initWithCString: tmp2];
		nickname = [[OFString alloc] initWithUTF8String: tmp2];
	} @catch (id e) {
		[self release];
		@throw e;
	} @finally {
		if (tmp2 != NULL)
			free(tmp2);
	}