ObjFW  Check-in [66c20e115f]

Overview
Comment:OFString: Add a cast which is needed on NetBSD
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 66c20e115fd806e336ea746cdbcbcdfd81bd7ef75650e80569433d553a4564eb
User & Date: js on 2014-02-10 18:56:36
Other Links: manifest | tags
Context
2014-02-10
19:10
Add test for OF_JSON_REPRESENTATION_JSON5 check-in: 25b3aaf57c user: js tags: trunk
18:56
OFString: Add a cast which is needed on NetBSD check-in: 66c20e115f user: js tags: trunk
10:46
-[cancelAsyncRequests] documentation: Add warning check-in: 048c4912d6 user: js tags: trunk
Changes

Modified src/OFString.m from [ab5f534f76] to [5c8d912349].

1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
	if (options & OF_JSON_REPRESENTATION_JSON5) {
		[JSON replaceOccurrencesOfString: @"\n"
				      withString: @"\\\n"];

		if (options & OF_JSON_REPRESENTATION_IDENTIFIER) {
			const char *cString = [self UTF8String];

			if ((!isalpha(cString[0]) && cString[0] != '_' &&
			    cString[0] != '$') ||
			    strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {
				[JSON prependString: @"\""];
				[JSON appendString: @"\""];
			}
		} else {
			[JSON prependString: @"\""];







|







1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
	if (options & OF_JSON_REPRESENTATION_JSON5) {
		[JSON replaceOccurrencesOfString: @"\n"
				      withString: @"\\\n"];

		if (options & OF_JSON_REPRESENTATION_IDENTIFIER) {
			const char *cString = [self UTF8String];

			if ((!isalpha((int)cString[0]) && cString[0] != '_' &&
			    cString[0] != '$') ||
			    strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {
				[JSON prependString: @"\""];
				[JSON appendString: @"\""];
			}
		} else {
			[JSON prependString: @"\""];