Overview
Comment: | of_asprintf: Add %C format specifier. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e803913a9d932293d62da756bd2b00d4 |
User & Date: | js on 2013-11-22 19:27:05 |
Other Links: | manifest | tags |
Context
2013-11-22
| ||
23:23 | exception.m: Handle class name @id. check-in: 9b9b00c5d9 user: js tags: trunk | |
19:27 | of_asprintf: Add %C format specifier. check-in: e803913a9d user: js tags: trunk | |
18:23 | of_asprintf.m: Fix coding style. check-in: 619cced011 user: js tags: trunk | |
Changes
Modified src/OFMutableString.h from [339f0e1d69] to [b71605a981].
︙ | ︙ | |||
83 84 85 86 87 88 89 | encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength; /*! * @brief Appends a formatted string to the OFMutableString. * * See printf for the format syntax. As an addition, %@ is available as format | | | | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | encoding: (of_string_encoding_t)encoding length: (size_t)cStringLength; /*! * @brief Appends a formatted string to the OFMutableString. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A format string which generates the string to append */ - (void)appendFormat: (OFConstantString*)format, ...; /*! * @brief Appends a formatted string to the OFMutableString. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A format string which generates the string to append * @param arguments The arguments used in the format string */ - (void)appendFormat: (OFConstantString*)format arguments: (va_list)arguments; |
︙ | ︙ |
Modified src/OFStream.h from [e0f5011968] to [0895acb1d9].
︙ | ︙ | |||
983 984 985 986 987 988 989 | - (size_t)writeLine: (OFString*)string encoding: (of_string_encoding_t)encoding; /*! * @brief Writes a formatted string into the stream. * * See printf for the format syntax. As an addition, %@ is available as format | | | | 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 | - (size_t)writeLine: (OFString*)string encoding: (of_string_encoding_t)encoding; /*! * @brief Writes a formatted string into the stream. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A string used as format * @return The number of bytes written */ - (size_t)writeFormat: (OFConstantString*)format, ...; /*! * @brief Writes a formatted string into the stream. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A string used as format * @param arguments The arguments used in the format string * @return The number of bytes written */ - (size_t)writeFormat: (OFConstantString*)format arguments: (va_list)arguments; |
︙ | ︙ |
Modified src/OFString.h from [71ed97918e] to [5833b2a141].
︙ | ︙ | |||
261 262 263 264 265 266 267 | length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Creates a new OFString from a format string. * * See printf for the format syntax. As an addition, %@ is available as format | | | 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Creates a new OFString from a format string. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A string used as format to initialize the OFString * @return A new autoreleased OFString */ + (instancetype)stringWithFormat: (OFConstantString*)format, ...; /*! |
︙ | ︙ | |||
490 491 492 493 494 495 496 | length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a format string. * * See printf for the format syntax. As an addition, %@ is available as format | | | | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 | length: (size_t)length byteOrder: (of_byte_order_t)byteOrder; /*! * @brief Initializes an already allocated OFString with a format string. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A string used as format to initialize the OFString * @return An initialized OFString */ - initWithFormat: (OFConstantString*)format, ...; /*! * @brief Initializes an already allocated OFString with a format string. * * See printf for the format syntax. As an addition, %@ is available as format * specifier for objects and %C for of_unichar_t. * * @param format A string used as format to initialize the OFString * @param arguments The arguments used in the format string * @return An initialized OFString */ - initWithFormat: (OFConstantString*)format arguments: (va_list)arguments; |
︙ | ︙ |
Modified src/of_asprintf.m from [fa426a4240] to [0f6776e0aa].
︙ | ︙ | |||
24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #include <stdbool.h> #include <wchar.h> #include <sys/types.h> #import "OFString.h" #import "asprintf.h" #import "autorelease.h" #import "macros.h" #define MAX_SUBFORMAT_LEN 64 struct context { | > > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #include <stdbool.h> #include <wchar.h> #include <sys/types.h> #import "OFString.h" #import "OFInvalidEncodingException.h" #import "asprintf.h" #import "autorelease.h" #import "macros.h" #define MAX_SUBFORMAT_LEN 64 struct context { |
︙ | ︙ | |||
308 309 310 311 312 313 314 315 316 317 318 319 320 321 | } else tmpLen = asprintf(&tmp, ctx->subformat, "(nil)"); } @catch (id e) { free(ctx->buffer); @throw e; } break; case 'd': case 'i': switch (ctx->lengthModifier) { case LENGTH_MODIFIER_NONE: case LENGTH_MODIFIER_HH: | > > > > > > > > > > > > > > > > | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | } else tmpLen = asprintf(&tmp, ctx->subformat, "(nil)"); } @catch (id e) { free(ctx->buffer); @throw e; } break; case 'C': ctx->subformat[ctx->subformatLen - 1] = 's'; { char buffer[5]; size_t len = of_string_utf8_encode( va_arg(ctx->arguments, of_unichar_t), buffer); if (len == 0) @throw [OFInvalidEncodingException exception]; buffer[len] = 0; tmpLen = asprintf(&tmp, ctx->subformat, buffer); } break; case 'd': case 'i': switch (ctx->lengthModifier) { case LENGTH_MODIFIER_NONE: case LENGTH_MODIFIER_HH: |
︙ | ︙ |
Modified utils/OFZIP.m from [0b404e4622] to [1ea5d0a9d3].
︙ | ︙ | |||
90 91 92 93 94 95 96 | mode = option; break; case 'h': help(of_stdout, true, 0); break; default: | | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | mode = option; break; case 'h': help(of_stdout, true, 0); break; default: [of_stderr writeFormat: @"%@: Unknown option: -%C\n", [OFApplication programName], [optionsParser lastOption]]; [OFApplication terminateWithStatus: 1]; } } remainingArguments = [optionsParser remainingArguments]; |
︙ | ︙ |