Overview
Comment: | Rename -[appendWithFormat:] to -[appendFormat:]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
66bbe6da24e0ee248dbb2b1049e0e5f3 |
User & Date: | js on 2010-04-07 18:39:04 |
Other Links: | manifest | tags |
Context
2010-04-07
| ||
18:43 | Add -[writeFormat:] to OFStream. check-in: fe3b6e5457 user: js tags: trunk | |
18:39 | Rename -[appendWithFormat:] to -[appendFormat:]. check-in: 66bbe6da24 user: js tags: trunk | |
2010-04-04
| ||
16:50 | Rename -[splitWithDelimiter:] to -[componentsSeparatedByString:]. check-in: 7bc07fede9 user: js tags: trunk | |
Changes
Modified src/OFMutableString.h from [648def6058] to [ab2207f3d5].
︙ | ︙ | |||
74 75 76 77 78 79 80 | /** * Appends a formatted UTF-8 encoded C string to the OFString. * See printf for the format syntax. * * \param fmt A format string which generates the string to append */ | | | | | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | /** * Appends a formatted UTF-8 encoded C string to the OFString. * See printf for the format syntax. * * \param fmt A format string which generates the string to append */ - appendFormat: (OFString*)fmt, ...; /** * Appends a formatted UTF-8 encoded C string to the OFString. * See printf for the format syntax. * * \param fmt A format string which generates the string to append * \param args The arguments used in the format string */ - appendFormat: (OFString*)fmt withArguments: (va_list)args; /** * Reverse the OFString. */ - reverse; /** |
︙ | ︙ |
Modified src/OFMutableString.m from [f8d1ab3b42] to [7f7b9ed83b].
︙ | ︙ | |||
231 232 233 234 235 236 237 | if (str->is_utf8) is_utf8 = YES; return self; } | | | | | | | | > | > | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | if (str->is_utf8) is_utf8 = YES; return self; } - appendFormat: (OFString*)fmt, ... { id ret; va_list args; va_start(args, fmt); ret = [self appendFormat: fmt withArguments: args]; va_end(args); return ret; } - appendFormat: (OFString*)fmt withArguments: (va_list)args { char *t; if (fmt == nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if ((vasprintf(&t, [fmt cString], args)) == -1) { /* * This is only the most likely error to happen. Unfortunately, * there is no good way to check what really happened. */ @throw [OFOutOfMemoryException newWithClass: isa]; } @try { [self appendCString: t]; } @finally { free(t); } |
︙ | ︙ |
Modified src/OFString.m from [e681f2fd16] to [ae6ba38916].
︙ | ︙ | |||
452 453 454 455 456 457 458 | arguments: (va_list)args { int t; Class c; self = [super init]; | | | > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | arguments: (va_list)args { int t; Class c; self = [super init]; if (fmt == nil) { c = isa; [super dealloc]; @throw [OFInvalidArgumentException newWithClass: c selector: _cmd]; } if ((t = vasprintf(&string, [fmt cString], args)) == -1) { c = isa; [super dealloc]; /* |
︙ | ︙ |
Modified tests/OFString.m from [e66119ebd2] to [6ebf6017ca].
︙ | ︙ | |||
137 138 139 140 141 142 143 | encoding: OF_STRING_ENCODING_WINDOWS_1252] isEqual: @"€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ"]) TEST(@"+[stringWithFormat:]", [(s[0] = [OFMutableString stringWithFormat: @"%s: %d", "test", 123]) isEqual: @"test: 123"]) | | | | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | encoding: OF_STRING_ENCODING_WINDOWS_1252] isEqual: @"€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ"]) TEST(@"+[stringWithFormat:]", [(s[0] = [OFMutableString stringWithFormat: @"%s: %d", "test", 123]) isEqual: @"test: 123"]) TEST(@"-[appendFormat:]", [([s[0] appendFormat: @"%02X", 15]) isEqual: @"test: 1230F"]) TEST(@"-[indexOfFirstOccurrenceOfString:]", [@"𝄞öö" indexOfFirstOccurrenceOfString: @"öö"] == 1 && [@"𝄞öö" indexOfFirstOccurrenceOfString: @"ö"] == 1 && [@"𝄞öö" indexOfFirstOccurrenceOfString: @"𝄞"] == 0 && [@"𝄞öö" indexOfFirstOccurrenceOfString: @"x"] == SIZE_MAX) |
︙ | ︙ |