all warnings fixed

pull/47/head
Benjamin Runnels 9 years ago
parent f90bf5bb30
commit b3408a7022
  1. 3
      mqtt/mqtt_msg.c
  2. 194
      mqtt/utils.c

@ -125,7 +125,8 @@ static mqtt_message_t* ICACHE_FLASH_ATTR fini_message(mqtt_connection_t* connect
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length) { mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length) {
memset(connection, 0, sizeof(connection)); uint8_t len = sizeof(connection);
memset(connection, '\0', len);
connection->buffer = buffer; connection->buffer = buffer;
connection->buffer_length = buffer_length; connection->buffer_length = buffer_length;
} }

@ -32,113 +32,113 @@
*/ */
#include "utils.h" #include "utils.h"
uint8_t ICACHE_FLASH_ATTR
uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str) UTILS_IsIPV4(int8_t *str)
{ {
uint8_t segs = 0; /* Segment count. */ uint8_t segs = 0; /* Segment count. */
uint8_t chcnt = 0; /* Character count within segment. */ uint8_t chcnt = 0; /* Character count within segment. */
uint8_t accum = 0; /* Accumulator for segment. */ uint8_t accum = 0; /* Accumulator for segment. */
/* Catch NULL pointer. */ /* Catch NULL pointer. */
if (str == 0) if (str == 0)
return 0;
/* Process every character in string. */
while (*str != '\0') {
/* Segment changeover. */
if (*str == '.') {
/* Must have some digits in segment. */
if (chcnt == 0)
return 0;
/* Limit number of segments. */
if (++segs == 4)
return 0; return 0;
/* Process every character in string. */ /* Reset segment values and restart loop. */
chcnt = accum = 0;
while (*str != '\0') { str++;
/* Segment changeover. */ continue;
if (*str == '.') {
/* Must have some digits in segment. */
if (chcnt == 0)
return 0;
/* Limit number of segments. */
if (++segs == 4)
return 0;
/* Reset segment values and restart loop. */
chcnt = accum = 0;
str++;
continue;
}
/* Check numeric. */
if ((*str < '0') || (*str > '9'))
return 0;
/* Accumulate and check segment. */
if ((accum = accum * 10 + *str - '0') > 255)
return 0;
/* Advance other segment specific stuff and continue loop. */
chcnt++;
str++;
} }
/* Check enough segments and enough characters in last segment. */ /* Check numeric. */
if ((*str < '0') || (*str > '9'))
return 0;
if (segs != 3) /* Accumulate and check segment. */
return 0;
if (chcnt == 0) if ((accum = accum * 10 + *str - '0') > 255)
return 0; return 0;
/* Address okay. */ /* Advance other segment specific stuff and continue loop. */
chcnt++;
str++;
}
/* Check enough segments and enough characters in last segment. */
return 1; if (segs != 3)
return 0;
if (chcnt == 0)
return 0;
/* Address okay. */
return 1;
} }
uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip)
{
/* The count of the number of bytes processed. */ uint8_t ICACHE_FLASH_ATTR
int i; UTILS_StrToIP(const int8_t* str, void *ip)
/* A pointer to the next digit to process. */ {
const char * start;
start = str;
for (i = 0; i < 4; i++) {
/* The digit being processed. */
char c;
/* The value of this byte. */
int n = 0;
while (1) {
c = * start;
start++;
if (c >= '0' && c <= '9') {
n *= 10;
n += c - '0';
}
/* We insist on stopping at "." if we are still parsing
the first, second, or third numbers. If we have reached
the end of the numbers, we will allow any character. */
else if ((i < 3 && c == '.') || i == 3) {
break;
}
else {
return 0;
}
}
if (n >= 256) {
return 0;
}
((uint8_t*)ip)[i] = n;
}
return 1;
/* The count of the number of bytes processed. */
int i;
/* A pointer to the next digit to process. */
for (i = 0; i < 4; i++) {
/* The digit being processed. */
char c;
/* The value of this byte. */
int n = 0;
while (1) {
c = *(const char *)str;
(const char *)str++;
if (c >= '0' && c <= '9') {
n *= 10;
n += c - '0';
}
/* We insist on stopping at "." if we are still parsing
the first, second, or third numbers. If we have reached
the end of the numbers, we will allow any character. */
else if ((i < 3 && c == '.') || i == 3) {
break;
}
else {
return 0;
}
}
if (n >= 256) {
return 0;
}
((uint8_t*)ip)[i] = n;
}
return 1;
} }
uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s)
uint32_t ICACHE_FLASH_ATTR
UTILS_Atoh(const int8_t *s)
{ {
uint32_t value = 0, digit; uint32_t value = 0, digit;
int8_t c; int8_t c;
while((c = *s++)){ while ((c = *s++)){
if('0' <= c && c <= '9') if ('0' <= c && c <= '9')
digit = c - '0'; digit = c - '0';
else if('A' <= c && c <= 'F') else if ('A' <= c && c <= 'F')
digit = c - 'A' + 10; digit = c - 'A' + 10;
else if('a' <= c && c<= 'f') else if ('a' <= c && c <= 'f')
digit = c - 'a' + 10; digit = c - 'a' + 10;
else break; else break;
value = (value << 4) | digit; value = (value << 4) | digit;
} }
return value; return value;
} }

Loading…
Cancel
Save