riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/cbor: Fix -Wformat=2 warnings

Browse Source
This commit is contained in:
Joakim Nohlgård 2018-06-14 22:46:33 +02:00 committed by Gaëtan Harter
parent d04058b54b
commit 2b31129ef0
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/cbor/cbor.c
View File

@ -87,6 +87,7 @@
/* Array size */ /* Array size */
#define MAX_TIMESTRING_LENGTH (21) #define MAX_TIMESTRING_LENGTH (21)
#define TIMESTRING_FORMAT "%Y-%m-%dT%H:%M:%SZ"
#ifndef INFINITY #ifndef INFINITY
#define INFINITY (1.0/0.0) #define INFINITY (1.0/0.0)
@ -767,9 +768,8 @@ size_t cbor_deserialize_date_time(const cbor_stream_t *stream, size_t offset, st
char buffer[21]; char buffer[21];
offset++; /* skip tag byte to decode date_time */ offset++; /* skip tag byte to decode date_time */
size_t read_bytes = cbor_deserialize_unicode_string(stream, offset, buffer, sizeof(buffer)); size_t read_bytes = cbor_deserialize_unicode_string(stream, offset, buffer, sizeof(buffer));
const char *format = "%Y-%m-%dT%H:%M:%SZ";
if (strptime(buffer, format, val) == 0) { if (strptime(buffer, TIMESTRING_FORMAT, val) == 0) {
return 0; return 0;
} }
@ -787,9 +787,8 @@ size_t cbor_serialize_date_time(cbor_stream_t *stream, struct tm *val)
CBOR_ENSURE_SIZE(stream, MAX_TIMESTRING_LENGTH + 1); /* + 1 tag byte */ CBOR_ENSURE_SIZE(stream, MAX_TIMESTRING_LENGTH + 1); /* + 1 tag byte */
char time_str[MAX_TIMESTRING_LENGTH]; char time_str[MAX_TIMESTRING_LENGTH];
const char *format = "%Y-%m-%dT%H:%M:%SZ";
if (strftime(time_str, sizeof(time_str), format, val) == 0) { /* struct tm to string */ if (strftime(time_str, sizeof(time_str), TIMESTRING_FORMAT, val) == 0) { /* struct tm to string */
return 0; return 0;
} }
@ -1017,7 +1016,7 @@ static size_t cbor_stream_decode_at(cbor_stream_t *stream, size_t offset, int in
char buf[64]; char buf[64];
struct tm timeinfo; struct tm timeinfo;
size_t read_bytes = cbor_deserialize_date_time(stream, offset, &timeinfo); size_t read_bytes = cbor_deserialize_date_time(stream, offset, &timeinfo);
strftime(buf, sizeof(buf), "%c", &timeinfo); strftime(buf, sizeof(buf), TIMESTRING_FORMAT, &timeinfo);
printf("(tag: %u, date/time string: \"%s\")\n", tag, buf); printf("(tag: %u, date/time string: \"%s\")\n", tag, buf);
return read_bytes; return read_bytes;
} }