ObjFW  Check-in [bcdf93590c]

Overview
Comment:Fix append for OFWideString.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: bcdf93590c30337e77871118f2452483bf4ce4858f8fdbccf6f9de97086698ae
User & Date: js on 2008-09-14 18:17:36
Other Links: manifest | tags
Context
2008-09-14
18:26
Automatic tests for OFString and OFWideString. check-in: dd22ec2c8e user: js tags: trunk
18:17
Fix append for OFWideString. check-in: bcdf93590c user: js tags: trunk
17:59
Fix missing terminating char and glibc bug. check-in: 1c2e0d4711 user: js tags: trunk
Changes

Modified configure.ac from [62f4ec636e] to [2601770269].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
AC_INIT(objfw, 0.1, js-objfw@webkeks.org)
AC_CONFIG_SRCDIR(src)

AC_CANONICAL_HOST
AC_CANONICAL_TARGET

AC_PROG_OBJC
AC_PROG_CPP
AC_PROG_LN_S
AC_PATH_PROG(AR, ar)

case "$CC" in
	gcc | *-gcc | gcc-* | *-gcc-*)
		OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe"
		;;
esac

OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString -fobjc-exceptions"

BUILDSYS_SHARED_LIB

AC_SUBST(PACKAGE, objfw)
AC_CONFIG_FILES(buildsys.mk)
AC_OUTPUT













|










1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
AC_INIT(objfw, 0.1, js-objfw@webkeks.org)
AC_CONFIG_SRCDIR(src)

AC_CANONICAL_HOST
AC_CANONICAL_TARGET

AC_PROG_OBJC
AC_PROG_CPP
AC_PROG_LN_S
AC_PATH_PROG(AR, ar)

case "$CC" in
	gcc | *-gcc | gcc-* | *-gcc-*)
		OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe -g"
		;;
esac

OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString -fobjc-exceptions"

BUILDSYS_SHARED_LIB

AC_SUBST(PACKAGE, objfw)
AC_CONFIG_FILES(buildsys.mk)
AC_OUTPUT

Modified src/OFWideString.m from [9ef8d3d479] to [8978f6afd4].

94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
		return [self setTo: wstr];

	strlength = wcslen(wstr);
	newlen = length + strlength;

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

	memcpy(newstr + length * sizeof(wchar_t), wstr,
	    (strlength + 1) * sizeof(wchar_t));

	length = newlen;
	wstring = newstr;

	return self;
}
@end







|
<


<
|







94
95
96
97
98
99
100
101

102
103

104
105
106
107
108
109
110
111
		return [self setTo: wstr];

	strlength = wcslen(wstr);
	newlen = length + strlength;

	/* FIXME: Add error handling */
	if ((newstr = [self resizeMem: wstring
			       toSize: (newlen + 1) * sizeof(wchar_t)]) == NULL)

		return nil;


	memcpy(newstr + length, wstr, (strlength + 1) * sizeof(wchar_t));

	length = newlen;
	wstring = newstr;

	return self;
}
@end