Overview
| Comment: | OFDate: Use wcsftime on Windows
strftime creates strings on Windows that are not valid UTF-8. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b8fc41bf1834406116a0c22d8fa78e67 |
| User & Date: | js on 2015-11-02 15:07:47 |
| Other Links: | manifest | tags |
Context
|
2015-11-02
| ||
| 19:27 | OFSHA*Hash: Minor cleanup check-in: 6a3c47863d user: js tags: trunk | |
| 15:07 | OFDate: Use wcsftime on Windows check-in: b8fc41bf18 user: js tags: trunk | |
| 13:53 | OFHTTP{Client,Server}: Concatenate repeated fields check-in: b73d25b8c6 user: js tags: trunk | |
Changes
Modified src/OFDate.m from [d311cf12a2] to [edf5bb546e].
| ︙ | ︙ | |||
506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 |
- (OFString*)dateStringWithFormat: (OFConstantString*)format
{
OFString *ret;
time_t seconds = (time_t)_seconds;
struct tm tm;
size_t pageSize;
char *buffer;
if (seconds != floor(_seconds))
@throw [OFOutOfRangeException exception];
#ifdef HAVE_GMTIME_R
if (gmtime_r(&seconds, &tm) == NULL)
@throw [OFOutOfRangeException exception];
| > > > > | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 |
- (OFString*)dateStringWithFormat: (OFConstantString*)format
{
OFString *ret;
time_t seconds = (time_t)_seconds;
struct tm tm;
size_t pageSize;
#ifndef OF_WINDOWS
char *buffer;
#else
wchar_t *buffer;
#endif
if (seconds != floor(_seconds))
@throw [OFOutOfRangeException exception];
#ifdef HAVE_GMTIME_R
if (gmtime_r(&seconds, &tm) == NULL)
@throw [OFOutOfRangeException exception];
|
| ︙ | ︙ | |||
537 538 539 540 541 542 543 |
# endif
#endif
pageSize = [OFSystemInfo pageSize];
buffer = [self allocMemoryWithSize: pageSize];
@try {
| > | > > > > > > > > > > > | 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 |
# endif
#endif
pageSize = [OFSystemInfo pageSize];
buffer = [self allocMemoryWithSize: pageSize];
@try {
#ifndef OF_WINDOWS
if (strftime(buffer, pageSize, [format UTF8String], &tm) == 0)
@throw [OFOutOfRangeException exception];
ret = [OFString stringWithUTF8String: buffer];
#else
if (wcsftime(buffer, pageSize / sizeof(wchar_t),
[format UTF16String], &tm) == 0)
@throw [OFOutOfRangeException exception];
ret = [OFString stringWithUTF16String: buffer];
#endif
} @finally {
[self freeMemory: buffer];
}
return ret;
}
- (OFString*)localDateStringWithFormat: (OFConstantString*)format
{
OFString *ret;
time_t seconds = (time_t)_seconds;
struct tm tm;
size_t pageSize;
#ifndef OF_WINDOWS
char *buffer;
#else
wchar_t *buffer;
#endif
if (seconds != floor(_seconds))
@throw [OFOutOfRangeException exception];
#ifdef HAVE_LOCALTIME_R
if (localtime_r(&seconds, &tm) == NULL)
@throw [OFOutOfRangeException exception];
|
| ︙ | ︙ | |||
585 586 587 588 589 590 591 |
# endif
#endif
pageSize = [OFSystemInfo pageSize];
buffer = [self allocMemoryWithSize: pageSize];
@try {
| > | > > > > > > > | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 |
# endif
#endif
pageSize = [OFSystemInfo pageSize];
buffer = [self allocMemoryWithSize: pageSize];
@try {
#ifndef OF_WINDOWS
if (strftime(buffer, pageSize, [format UTF8String], &tm) == 0)
@throw [OFOutOfRangeException exception];
ret = [OFString stringWithUTF8String: buffer];
#else
if (wcsftime(buffer, pageSize / sizeof(wchar_t),
[format UTF16String], &tm) == 0)
@throw [OFOutOfRangeException exception];
ret = [OFString stringWithUTF16String: buffer];
#endif
} @finally {
[self freeMemory: buffer];
}
return ret;
}
|
| ︙ | ︙ |