Skip to content

Commit 1c25bce

Browse files
gordonwang0huguesBouvier
gordonwang0
authored and
huguesBouvier
committed
Remove header inttypes.h from SDK source files. (aws#173)
1 parent d926b75 commit 1c25bce

File tree

3 files changed

+13
-27
lines changed

3 files changed

+13
-27
lines changed

‎src/aws_iot_jobs_json.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ extern "C" {
2424
#include <stddef.h>
2525
#include <stdio.h>
2626
#include <stdarg.h>
27-
#include <inttypes.h>
2827

2928
#include "jsmn.h"
3029
#include "aws_iot_jobs_json.h"
@@ -75,7 +74,7 @@ static void _printStringValue(struct _SerializeState *state, const char *value)
7574
}
7675

7776
static void _printLongValue(struct _SerializeState *state, int64_t value) {
78-
_printToBuffer(state, "%" PRId64, value);
77+
_printToBuffer(state, "%lld", value);
7978
}
8079

8180
static void _printBooleanValue(struct _SerializeState *state, bool value) {

‎src/aws_iot_json_utils.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ extern "C" {
3232
#include <stdint.h>
3333
#include <string.h>
3434

35-
#ifdef __cplusplus
36-
#include <cinttypes>
37-
#else
38-
39-
#include <inttypes.h>
40-
41-
#endif
42-
4335
#include "aws_iot_log.h"
4436

4537
int8_t jsoneq(const char *json, jsmntok_t *tok, const char *s) {
@@ -59,7 +51,7 @@ IoT_Error_t parseUnsignedInteger32Value(uint32_t *i, const char *jsonString, jsm
5951
return JSON_PARSE_ERROR;
6052
}
6153

62-
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%" SCNu32, i))) {
54+
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%u", i))) {
6355
IOT_WARN("Token was not an unsigned integer.");
6456
return JSON_PARSE_ERROR;
6557
}
@@ -73,7 +65,7 @@ IoT_Error_t parseUnsignedInteger16Value(uint16_t *i, const char *jsonString, jsm
7365
return JSON_PARSE_ERROR;
7466
}
7567

76-
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%" SCNu16, i))) {
68+
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%hu", i))) {
7769
IOT_WARN("Token was not an unsigned integer.");
7870
return JSON_PARSE_ERROR;
7971
}
@@ -87,7 +79,7 @@ IoT_Error_t parseUnsignedInteger8Value(uint8_t *i, const char *jsonString, jsmnt
8779
return JSON_PARSE_ERROR;
8880
}
8981

90-
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%" SCNu8, i))) {
82+
if(('-' == (char) (jsonString[token->start])) || (1 != sscanf(jsonString + token->start, "%hhu", i))) {
9183
IOT_WARN("Token was not an unsigned integer.");
9284
return JSON_PARSE_ERROR;
9385
}
@@ -101,7 +93,7 @@ IoT_Error_t parseInteger32Value(int32_t *i, const char *jsonString, jsmntok_t *t
10193
return JSON_PARSE_ERROR;
10294
}
10395

104-
if(1 != sscanf(jsonString + token->start, "%" SCNi32, i)) {
96+
if(1 != sscanf(jsonString + token->start, "%i", i)) {
10597
IOT_WARN("Token was not an integer.");
10698
return JSON_PARSE_ERROR;
10799
}
@@ -115,7 +107,7 @@ IoT_Error_t parseInteger16Value(int16_t *i, const char *jsonString, jsmntok_t *t
115107
return JSON_PARSE_ERROR;
116108
}
117109

118-
if(1 != sscanf(jsonString + token->start, "%" SCNi16, i)) {
110+
if(1 != sscanf(jsonString + token->start, "%hi", i)) {
119111
IOT_WARN("Token was not an integer.");
120112
return JSON_PARSE_ERROR;
121113
}
@@ -129,7 +121,7 @@ IoT_Error_t parseInteger8Value(int8_t *i, const char *jsonString, jsmntok_t *tok
129121
return JSON_PARSE_ERROR;
130122
}
131123

132-
if(1 != sscanf(jsonString + token->start, "%" SCNi8, i)) {
124+
if(1 != sscanf(jsonString + token->start, "%hhi", i)) {
133125
IOT_WARN("Token was not an integer.");
134126
return JSON_PARSE_ERROR;
135127
}

‎src/aws_iot_shadow_json.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020

2121
#ifdef __cplusplus
2222
extern "C" {
23-
#include <cinttypes>
24-
#else
25-
26-
#include <inttypes.h>
27-
2823
#endif
2924

3025
#include "aws_iot_shadow_json.h"
@@ -349,17 +344,17 @@ static IoT_Error_t convertDataToString(char *pStringBuffer, size_t maxSizoString
349344
}
350345

351346
if(type == SHADOW_JSON_INT32) {
352-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIi32",", *(int32_t *) (pData));
347+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%i,", *(int32_t *) (pData));
353348
} else if(type == SHADOW_JSON_INT16) {
354-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIi16",", *(int16_t *) (pData));
349+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%hi,", *(int16_t *) (pData));
355350
} else if(type == SHADOW_JSON_INT8) {
356-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIi8",", *(int8_t *) (pData));
351+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%hhi,", *(int8_t *) (pData));
357352
} else if(type == SHADOW_JSON_UINT32) {
358-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIu32",", *(uint32_t *) (pData));
353+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%u,", *(uint32_t *) (pData));
359354
} else if(type == SHADOW_JSON_UINT16) {
360-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIu16",", *(uint16_t *) (pData));
355+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%hu,", *(uint16_t *) (pData));
361356
} else if(type == SHADOW_JSON_UINT8) {
362-
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%" PRIu8",", *(uint8_t *) (pData));
357+
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%hhu,", *(uint8_t *) (pData));
363358
} else if(type == SHADOW_JSON_DOUBLE) {
364359
snPrintfReturn = snprintf(pStringBuffer, maxSizoStringBuffer, "%f,", *(double *) (pData));
365360
} else if(type == SHADOW_JSON_FLOAT) {

0 commit comments

Comments
 (0)