kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #1599 from LudwigOrtmann/issue-1597

Browse Source 
sys/cbor,tests: fix cbor daylight saving time
This commit is contained in:
Ludwig Ortmann 2014-08-27 11:11:49 +02:00
commit 3d611679ee
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cbor/cbor.c
View File

@ -694,6 +694,8 @@ size_t cbor_deserialize_date_time(const cbor_stream_t *stream, size_t offset, st
return 0;
}
val->tm_isdst = -1; /* not set by strptime(), undefined in CBOR */
if (mktime(val) == -1) {
return 0;
}

1
tests/unittests/tests-cbor/tests-cbor.c
View File

@ -541,6 +541,7 @@ static void test_date_time(void)
val.tm_hour = 15;
val.tm_min = 0;
val.tm_sec = 0;
val.tm_isdst = -1;
mktime(&val);
TEST_ASSERT(cbor_serialize_date_time(&stream, &val));
CBOR_CHECK_SERIALIZED(stream, data, sizeof(data));