ObjFW  Diff

Differences From Artifact [52bd147dc6]:

To Artifact [1c1ae2a28e]:


28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
{
	if ((self = [super init])) {
		if (str == NULL) {
			length = 0;
			string = NULL;
		} else {
			length = strlen(str);
			if ((string = [self getMem: length]) == NULL)
				return NULL;
			memcpy(string, str, length);
		}
	}
	return self;
}

- (char*)cString
{







|

|







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
{
	if ((self = [super init])) {
		if (str == NULL) {
			length = 0;
			string = NULL;
		} else {
			length = strlen(str);
			if ((string = [self getMem: length + 1]) == NULL)
				return NULL;
			memcpy(string, str, length + 1);
		}
	}
	return self;
}

- (char*)cString
{
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
		length = 0;
		string = NULL;

		return self;
	}

	newlen = strlen(str);
	if ((newstr = [self getMem: newlen]) == NULL)
		return nil;
	memcpy(newstr, str, newlen);

	if (string != NULL)
		[self freeMem: string];

	length = newlen;
	string = newstr;








|

|







61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
		length = 0;
		string = NULL;

		return self;
	}

	newlen = strlen(str);
	if ((newstr = [self getMem: newlen + 1]) == NULL)
		return nil;
	memcpy(newstr, str, newlen + 1);

	if (string != NULL)
		[self freeMem: string];

	length = newlen;
	string = newstr;

95
96
97
98
99
100
101
102
103
104
105
106
107

108
109
110
111
	newlen = length + strlength;

	/* FIXME: Add error handling */
	if ((newstr = [self resizeMem: string
			       toSize: newlen + 1]) == NULL)
		return nil;

	string = newstr;

	memcpy(string + length, str, strlength);
	string[newlen] = '\0';

	length = newlen;


	return self;
}
@end







<
<
|
<


>




95
96
97
98
99
100
101


102

103
104
105
106
107
108
109
	newlen = length + strlength;

	/* FIXME: Add error handling */
	if ((newstr = [self resizeMem: string
			       toSize: newlen + 1]) == NULL)
		return nil;



	memcpy(newstr + length, str, strlength + 1);


	length = newlen;
	string = newstr;

	return self;
}
@end