Overview
| Comment: | Add -[readStringWithLength:] to OFStream. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
90a9d9475a7b1f1ef6b92040acdcf2f5 |
| User & Date: | js on 2011-06-28 22:56:11 |
| Other Links: | manifest | tags |
Context
|
2011-06-29
| ||
| 19:06 | Add a handler for unknown entities to OFXMLElementBuilderDelegate. check-in: d534f49a7d user: js tags: trunk | |
|
2011-06-28
| ||
| 22:56 | Add -[readStringWithLength:] to OFStream. check-in: 90a9d9475a user: js tags: trunk | |
| 22:21 | Add OFCopying to OFXMLElement. check-in: 33ac65f8f7 user: js tags: trunk | |
Changes
Modified src/OFStream.h from [11ac1a2f52] to [4293607bf6].
| ︙ | ︙ | |||
356 357 358 359 360 361 362 | /** * \return An OFDataArray with an item size of 1 with all the data of the * stream until the end of the stream is reached. */ - (OFDataArray*)readDataArrayTillEndOfStream; /** | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | /** * \return An OFDataArray with an item size of 1 with all the data of the * stream until the end of the stream is reached. */ - (OFDataArray*)readDataArrayTillEndOfStream; /** * Reads a string with the specified length from the stream. If a \\0 appears in * the stream, the string will be truncated at the \\0 and the rest of the * bytes of the string will be lost. This way, reading from the stream will not * break because of a \\0 because the specified number of bytes is still being * read and only the string gets truncated. * * WARNING: Only call this when you know that enough data is available! * Otherwise you will get an exception! * * \param length The length (in bytes) of the string to read from the stream * \return A string with the specified length */ - (OFString*)readStringWithLength: (size_t)length; /** * Reads a string with the specified encoding and length from the stream. If a * \\0 appears in the stream, the string will be truncated at the \\0 and the * rest of the bytes of the string will be lost. This way, reading from the * stream will not break because of a \\0 because the specified number of bytes * is still being read and only the string gets truncated. * * WARNING: Only call this when you know that enough data is available! * Otherwise you will get an exception! * * \param encoding The encoding of the string to read from the stream * \param length The length (in bytes) of the string to read from the stream * \return A string with the specified length */ - (OFString*)readStringWithEncoding: (of_string_encoding_t)encoding length: (size_t)length; /** * Reads until a newline, \\0 or end of stream occurs. * * \return The line that was read, autoreleased, or nil if the end of the * stream has been reached. */ - (OFString*)readLine; /** * Reads with the specified encoding until a newline, \\0 or end of stream * occurs. * * \param encoding The encoding used by the stream * \return The line that was read, autoreleased, or nil if the end of the * stream has been reached. */ - (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding; /** * Reads until the specified string or \\0 is found or the end of stream occurs. * * \param delimiter The delimiter * \return The line that was read, autoreleased, or nil if the end of the * stream has been reached. */ - (OFString*)readTillDelimiter: (OFString*)delimiter; /** * Reads until the specified string or \\0 is found or the end of stream occurs. * * \param delimiter The delimiter * \param encoding The encoding used by the stream * \return The line that was read, autoreleased, or nil if the end of the * stream has been reached. */ - (OFString*)readTillDelimiter: (OFString*)delimiter |
| ︙ | ︙ |
Modified src/OFStream.m from [5994783433] to [31bd6101f0].
| ︙ | ︙ | |||
473 474 475 476 477 478 479 480 481 482 483 484 485 486 |
}
} @finally {
[self freeMemory: buffer];
}
return dataArray;
}
- (OFString*)readLine
{
return [self readLineWithEncoding: OF_STRING_ENCODING_UTF_8];
}
- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding
| > > > > > > > > > > > > > > > > > > > > > > > > > > | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 |
}
} @finally {
[self freeMemory: buffer];
}
return dataArray;
}
- (OFString*)readStringWithLength: (size_t)length
{
return [self readStringWithEncoding: OF_STRING_ENCODING_UTF_8
length: length];
}
- (OFString*)readStringWithEncoding: (of_string_encoding_t)encoding
length: (size_t)length
{
OFString *ret;
char *buffer = [self allocMemoryWithSize: length + 1];
buffer[length] = 0;
@try {
[self readExactlyNBytes: length
intoBuffer: buffer];
ret = [OFString stringWithCString: buffer
encoding: encoding];
} @finally {
[self freeMemory: buffer];
}
return ret;
}
- (OFString*)readLine
{
return [self readLineWithEncoding: OF_STRING_ENCODING_UTF_8];
}
- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding
|
| ︙ | ︙ |