Merge branch 'incorrect-types' into updated-toolchain

pull/134/head
Alastair D'Silva 9 years ago
commit 163986afb4
  1. 6
      esp-link/cgi.c
  2. 2
      esp-link/cgi.h

@ -106,18 +106,18 @@ int8_t ICACHE_FLASH_ATTR getUInt16Arg(HttpdConnData *connData, char *name, uint1
return 1; return 1;
} }
int8_t ICACHE_FLASH_ATTR getBoolArg(HttpdConnData *connData, char *name, bool *config) { int8_t ICACHE_FLASH_ATTR getBoolArg(HttpdConnData *connData, char *name, uint8_t *config) {
char buff[16]; char buff[16];
int len = httpdFindArg(connData->getArgs, name, buff, sizeof(buff)); int len = httpdFindArg(connData->getArgs, name, buff, sizeof(buff));
if (len < 0) return 0; // not found, skip if (len < 0) return 0; // not found, skip
if (os_strcmp(buff, "1") == 0 || os_strcmp(buff, "true") == 0) { if (os_strcmp(buff, "1") == 0 || os_strcmp(buff, "true") == 0) {
*config = true; *config = 1;
return 1; return 1;
} }
if (os_strcmp(buff, "0") == 0 || os_strcmp(buff, "false") == 0) { if (os_strcmp(buff, "0") == 0 || os_strcmp(buff, "false") == 0) {
*config = false; *config = 0;
return 1; return 1;
} }

@ -26,7 +26,7 @@ int8_t getUInt16Arg(HttpdConnData *connData, char *name, uint16_t *config);
// Get the HTTP query-string param 'name' and store it boolean value at 'config', // Get the HTTP query-string param 'name' and store it boolean value at 'config',
// supports 1/true and 0/false, returns -1 on error, 0 if not found, 1 if found // supports 1/true and 0/false, returns -1 on error, 0 if not found, 1 if found
int8_t getBoolArg(HttpdConnData *connData, char *name, bool *config); int8_t getBoolArg(HttpdConnData *connData, char *name, uint8_t *config);
int cgiMenu(HttpdConnData *connData); int cgiMenu(HttpdConnData *connData);

Loading…
Cancel
Save