Merge pull request #43 from LeeLeahy2/type-mismatches

Fix type mismatches

Author: nseidle

src/Parse_NMEA.cpp

@@ -201,7 +201,7 @@ bool sempNmeaFindAsterisk(SEMP_PARSE_STATE *parse, uint8_t data)
         parse->crc ^= data;
 
         // Verify that enough space exists in the buffer
-        if ((parse->length + NMEA_BUFFER_OVERHEAD) > parse->bufferLength)
+        if ((uint32_t)(parse->length + NMEA_BUFFER_OVERHEAD) > parse->bufferLength)
         {
             // sentence too long
             sempPrintf(parse->printDebug,

src/Parse_Unicore_Hash.cpp

@@ -81,7 +81,7 @@ void sempUnicoreHashValidatCrc(SEMP_PARSE_STATE *parse)
     }
 
     // Verify that enough space exists in the buffer
-    if ((parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
+    if ((uint32_t)(parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
     {
         // Sentence too long
         sempPrintf(parse->printDebug,
@@ -108,7 +108,7 @@ void sempUnicoreHashValidatCrc(SEMP_PARSE_STATE *parse)
 // Validate the checksum
 void sempUnicoreHashValidateChecksum(SEMP_PARSE_STATE *parse)
 {
-    int checksum;
+    uint32_t checksum;
     SEMP_SCRATCH_PAD *scratchPad = (SEMP_SCRATCH_PAD *)parse->scratchPad;
 
     // Determine if a CRC was used for this message
@@ -268,7 +268,7 @@ bool sempUnicoreHashFindAsterisk(SEMP_PARSE_STATE *parse, uint8_t data)
         parse->crc ^= data;
 
         // Verify that enough space exists in the buffer
-        if ((parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
+        if ((uint32_t)(parse->length + UNICORE_HASH_BUFFER_OVERHEAD) > parse->bufferLength)
         {
             // sentence too long
             sempPrintf(parse->printDebug,

src/SparkFun_Extensible_Message_Parser.cpp

@@ -76,7 +76,7 @@ SEMP_PARSE_STATE * sempAllocateParseStructure(
     // Allocate the parser
     length = parseBytes + scratchPadBytes;
     parse = (SEMP_PARSE_STATE *)malloc(length + bufferLength);
-    sempPrintf(printDebug, "parse: %p", parse);
+    sempPrintf(printDebug, "parse: %p", (void *)parse);
 
     // Initialize the parse structure
     if (parse)
@@ -85,13 +85,13 @@ SEMP_PARSE_STATE * sempAllocateParseStructure(
         memset(parse, 0, length);
 
         // Set the scratch pad area address
-        parse->scratchPad = ((void *)parse) + parseBytes;
+        parse->scratchPad = ((uint8_t *)parse) + parseBytes;
         parse->printDebug = printDebug;
         sempPrintf(parse->printDebug, "parse->scratchPad: %p", parse->scratchPad);
 
         // Set the buffer address and length
         parse->bufferLength = bufferLength;
-        parse->buffer = (uint8_t *)(parse->scratchPad + scratchPadBytes);
+        parse->buffer = ((uint8_t *)parse->scratchPad + scratchPadBytes);
         sempPrintf(parse->printDebug, "parse->buffer: %p", parse->buffer);
     }
     return parse;
@@ -131,8 +131,8 @@ void sempPrintParserConfiguration(SEMP_PARSE_STATE *parse, Print *print)
     {
         sempPrintln(print, "SparkFun Extensible Message Parser");
         sempPrintf(print, "    Name: %p (%s)", parse->parserName, parse->parserName);
-        sempPrintf(print, "    parsers: %p", parse->parsers);
-        sempPrintf(print, "    parserNames: %p", parse->parserNames);
+        sempPrintf(print, "    parsers: %p", (void *)parse->parsers);
+        sempPrintf(print, "    parserNames: %p", (void *)parse->parserNames);
         sempPrintf(print, "    parserCount: %d", parse->parserCount);
         sempPrintf(print, "    printError: %p", parse->printError);
         sempPrintf(print, "    printDebug: %p", parse->printDebug);