[PATCH v2 4/4] ucrtbase: Consolidate strftime code for formats %g %G %V.
Jeff Smith
whydoubt at gmail.com
Tue Nov 26 13:43:42 CST 2019
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
dlls/msvcrt/time.c | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index a926f7f667..0d29b1eb51 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1325,22 +1325,6 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
case 'G':
if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999))
goto einval_error;
- {
- int iso_year = year;
- if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0)
- iso_year--;
- else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(iso_year))
- iso_year++;
- if(*format == 'G')
- {
- if (!strftime_int(str, &ret, max, iso_year, 4, 0, 9999))
- return 0;
- } else {
- if (!strftime_int(str, &ret, max, iso_year%100, 2, 0, 99))
- return 0;
- }
- }
- break;
case 'V':
{
int iso_year = year;
@@ -1350,8 +1334,16 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max,
else if(iso_days >= 365 + IsLeapYear(iso_year))
iso_days -= 365 + IsLeapYear(iso_year++);
- if(!strftime_int(str, &ret, max, iso_days/7 + 1, alternate ? 0 : 2, 0, 53))
- return 0;
+ if(*format == 'G') {
+ if(!strftime_int(str, &ret, max, iso_year, 4, 0, 9999))
+ return 0;
+ } else if(*format == 'g') {
+ if(!strftime_int(str, &ret, max, iso_year%100, 2, 0, 99))
+ return 0;
+ } else {
+ if(!strftime_int(str, &ret, max, iso_days/7 + 1, alternate ? 0 : 2, 0, 53))
+ return 0;
+ }
}
break;
#endif
--
2.23.0
More information about the wine-devel
mailing list