Skip to content

Commit 695b0f5

Browse files
committed
Fix type mismatches
1 parent 6d2c898 commit 695b0f5

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/Parse_NMEA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ bool sempNmeaFindAsterisk(SEMP_PARSE_STATE *parse, uint8_t data)
201201
parse->crc ^= data;
202202

203203
// Verify that enough space exists in the buffer
204-
if ((parse->length + NMEA_BUFFER_OVERHEAD) > parse->bufferLength)
204+
if ((uint32_t)(parse->length + NMEA_BUFFER_OVERHEAD) > parse->bufferLength)
205205
{
206206
// sentence too long
207207
sempPrintf(parse->printDebug,

src/Parse_Unicore_Hash.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void sempUnicoreHashValidatCrc(SEMP_PARSE_STATE *parse)
8282
}
8383

8484
// Verify that enough space exists in the buffer
85-
if ((parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
85+
if ((uint32_t)(parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
8686
{
8787
// Sentence too long
8888
sempPrintf(parse->printDebug,
@@ -109,7 +109,7 @@ void sempUnicoreHashValidatCrc(SEMP_PARSE_STATE *parse)
109109
// Validate the checksum
110110
void sempUnicoreHashValidateChecksum(SEMP_PARSE_STATE *parse)
111111
{
112-
int checksum;
112+
uint32_t checksum;
113113
SEMP_SCRATCH_PAD *scratchPad = (SEMP_SCRATCH_PAD *)parse->scratchPad;
114114

115115
// Determine if a CRC was used for this message
@@ -269,7 +269,7 @@ bool sempUnicoreHashFindAsterisk(SEMP_PARSE_STATE *parse, uint8_t data)
269269
parse->crc ^= data;
270270

271271
// Verify that enough space exists in the buffer
272-
if ((parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
272+
if ((uint32_t)(parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
273273
{
274274
// sentence too long
275275
sempPrintf(parse->printDebug,

src/SparkFun_Extensible_Message_Parser.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ SEMP_PARSE_STATE * sempAllocateParseStructure(
7575
// Allocate the parser
7676
length = parseBytes + scratchPadBytes;
7777
parse = (SEMP_PARSE_STATE *)malloc(length + bufferLength);
78-
sempPrintf(printDebug, "parse: %p", parse);
78+
sempPrintf(printDebug, "parse: %p", (void *)parse);
7979

8080
// Initialize the parse structure
8181
if (parse)
@@ -84,13 +84,13 @@ SEMP_PARSE_STATE * sempAllocateParseStructure(
8484
memset(parse, 0, length);
8585

8686
// Set the scratch pad area address
87-
parse->scratchPad = ((void *)parse) + parseBytes;
87+
parse->scratchPad = ((uint8_t *)parse) + parseBytes;
8888
parse->printDebug = printDebug;
8989
sempPrintf(parse->printDebug, "parse->scratchPad: %p", parse->scratchPad);
9090

9191
// Set the buffer address and length
9292
parse->bufferLength = bufferLength;
93-
parse->buffer = (uint8_t *)(parse->scratchPad + scratchPadBytes);
93+
parse->buffer = ((uint8_t *)parse->scratchPad + scratchPadBytes);
9494
sempPrintf(parse->printDebug, "parse->buffer: %p", parse->buffer);
9595
}
9696
return parse;
@@ -130,8 +130,8 @@ void sempPrintParserConfiguration(SEMP_PARSE_STATE *parse, Print *print)
130130
{
131131
sempPrintln(print, "SparkFun Extensible Message Parser");
132132
sempPrintf(print, " Name: %p (%s)", parse->parserName, parse->parserName);
133-
sempPrintf(print, " parsers: %p", parse->parsers);
134-
sempPrintf(print, " parserNames: %p", parse->parserNames);
133+
sempPrintf(print, " parsers: %p", (void *)parse->parsers);
134+
sempPrintf(print, " parserNames: %p", (void *)parse->parserNames);
135135
sempPrintf(print, " parserCount: %d", parse->parserCount);
136136
sempPrintf(print, " printError: %p", parse->printError);
137137
sempPrintf(print, " printDebug: %p", parse->printDebug);

0 commit comments

Comments
 (0)