jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rules on core 2.3.0 compilation error

Browse Source 
Fix rules on core 2.3.0 compilation error (#6392)
This commit is contained in:
Theo Arends 2019-09-10 11:05:53 +02:00
parent 2a9b42a2a2
commit b811956d2f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sonoff/support.ino
View File

@ -124,6 +124,18 @@ size_t strcspn(const char *str1, const char *str2)
return ret; return ret;
} }
// https://clc-wiki.net/wiki/C_standard_library:string.h:strpbrk
// Locate the first occurrence in the string pointed to by s1 of any character from the string pointed to by s2
char* strpbrk(const char *s1, const char *s2)
{
while(*s1) {
if (strchr(s2, *s1++)) {
return (char*)--s1;
}
}
return 0;
}
// https://opensource.apple.com/source/Libc/Libc-583/stdlib/FreeBSD/strtoull.c // https://opensource.apple.com/source/Libc/Libc-583/stdlib/FreeBSD/strtoull.c
// Convert a string to an unsigned long long integer // Convert a string to an unsigned long long integer
#ifndef __LONG_LONG_MAX__ #ifndef __LONG_LONG_MAX__

8
sonoff/xdrv_10_rules.ino
View File

@ -887,7 +887,7 @@ char * findClosureBracket(char * pStart)
if (bFindClosures) { if (bFindClosures) {
return pointer; return pointer;
} else { } else {
return NULL; return nullptr;
} }
} }
@ -1015,7 +1015,7 @@ bool findNextObjectValue(char * &pointer, float &value)
break; break;
} else if (*pointer == '(') { //It is a sub expression bracketed with () } else if (*pointer == '(') { //It is a sub expression bracketed with ()
char * closureBracket = findClosureBracket(pointer); //Get the position of closure bracket ")" char * closureBracket = findClosureBracket(pointer); //Get the position of closure bracket ")"
if (closureBracket != NULL) { if (closureBracket != nullptr) {
value = evaluateExpression(pointer+1, closureBracket - pointer - 2); value = evaluateExpression(pointer+1, closureBracket - pointer - 2);
pointer = closureBracket + 1; pointer = closureBracket + 1;
bSucceed = true; bSucceed = true;
@ -1310,7 +1310,7 @@ bool findNextLogicObjectValue(char * &pointer, bool &value)
break; break;
} else if (*pointer == '(') { //It is a sub expression bracketed with () } else if (*pointer == '(') { //It is a sub expression bracketed with ()
char * closureBracket = findClosureBracket(pointer); //Get the position of closure bracket ")" char * closureBracket = findClosureBracket(pointer); //Get the position of closure bracket ")"
if (closureBracket != NULL) { if (closureBracket != nullptr) {
value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 2); value = evaluateLogicalExpression(pointer+1, closureBracket - pointer - 2);
pointer = closureBracket + 1; pointer = closureBracket + 1;
bSucceed = true; bSucceed = true;
@ -1555,7 +1555,7 @@ void ProcessIfStatement(const char* statements)
while (*pos && *pos != '(') { while (*pos && *pos != '(') {
pos++; pos++;
} }
if (NULL == *pos) break; if (0 == *pos) { break; }
char * posEnd = findClosureBracket(pos); char * posEnd = findClosureBracket(pos);
if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) { if (true == evaluateLogicalExpression(pos + 1, posEnd - (pos + 1))) {