mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
libc/time: Initialize tm_zone field correctly
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com> Change-Id: Ief32aedc72ec062d428f8538a25ddfe4f81d7e29
This commit is contained in:
@@ -1806,6 +1806,7 @@ static FAR struct tm *localsub(FAR const time_t *timep,
|
||||
result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
|
||||
tmp->tm_isdst = ttisp->tt_isdst;
|
||||
tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
|
||||
tmp->tm_zone = tzname[tmp->tm_isdst];
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -1829,6 +1830,7 @@ static FAR struct tm *gmtsub(FAR const time_t *timep,
|
||||
|
||||
tz_semgive(&g_gmt_sem);
|
||||
|
||||
tmp->tm_zone = GMT;
|
||||
return timesub(timep, offset, g_gmt_ptr, tmp);
|
||||
}
|
||||
|
||||
@@ -2003,7 +2005,6 @@ static FAR struct tm *timesub(FAR const time_t *timep,
|
||||
tmp->tm_mday = (int)(idays + 1);
|
||||
tmp->tm_isdst = 0;
|
||||
tmp->tm_gmtoff = offset;
|
||||
tmp->tm_zone = tzname[0];
|
||||
|
||||
return tmp;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user