From 6e01a07459d874f289cd76076cc3eee69f70bf37 Mon Sep 17 00:00:00 2001 From: cskarai Date: Sun, 18 Sep 2016 12:39:28 +0200 Subject: [PATCH] For cleaner understanding rename to WebServerSetup --- esp-link/{cgiwebserver.c => cgiwebserversetup.c} | 6 +++--- esp-link/{cgiwebserver.h => cgiwebserversetup.h} | 2 +- esp-link/main.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename esp-link/{cgiwebserver.c => cgiwebserversetup.c} (94%) rename esp-link/{cgiwebserver.h => cgiwebserversetup.h} (57%) diff --git a/esp-link/cgiwebserver.c b/esp-link/cgiwebserversetup.c similarity index 94% rename from esp-link/cgiwebserver.c rename to esp-link/cgiwebserversetup.c index 2c8b6b4..19bc1c5 100644 --- a/esp-link/cgiwebserver.c +++ b/esp-link/cgiwebserversetup.c @@ -16,7 +16,7 @@ const char * HTML_HEADER = "esp-link "
"; -int ICACHE_FLASH_ATTR webServerMultipartCallback(MultipartCmd cmd, char *data, int dataLen, int position) +int ICACHE_FLASH_ATTR webServerSetupMultipartCallback(MultipartCmd cmd, char *data, int dataLen, int position) { switch(cmd) { @@ -141,10 +141,10 @@ int ICACHE_FLASH_ATTR webServerMultipartCallback(MultipartCmd cmd, char *data, i MultipartCtx * webServerContext = NULL; -int ICACHE_FLASH_ATTR cgiWebServerUpload(HttpdConnData *connData) +int ICACHE_FLASH_ATTR cgiWebServerSetupUpload(HttpdConnData *connData) { if( webServerContext == NULL ) - webServerContext = multipartCreateContext( webServerMultipartCallback ); + webServerContext = multipartCreateContext( webServerSetupMultipartCallback ); return multipartProcess(webServerContext, connData); } diff --git a/esp-link/cgiwebserver.h b/esp-link/cgiwebserversetup.h similarity index 57% rename from esp-link/cgiwebserver.h rename to esp-link/cgiwebserversetup.h index e3365be..ffecb82 100644 --- a/esp-link/cgiwebserver.h +++ b/esp-link/cgiwebserversetup.h @@ -3,6 +3,6 @@ #include -int ICACHE_FLASH_ATTR cgiWebServerUpload(HttpdConnData *connData); +int ICACHE_FLASH_ATTR cgiWebServerSetupUpload(HttpdConnData *connData); #endif /* CGIWEBSERVER_H */ diff --git a/esp-link/main.c b/esp-link/main.c index fd3f624..4c04efa 100644 --- a/esp-link/main.c +++ b/esp-link/main.c @@ -19,7 +19,7 @@ #include "cgimqtt.h" #include "cgiflash.h" #include "cgioptiboot.h" -#include "cgiwebserver.h" +#include "cgiwebserversetup.h" #include "auth.h" #include "espfs.h" #include "uart.h" @@ -99,7 +99,7 @@ HttpdBuiltInUrl builtInUrls[] = { #ifdef MQTT { "/mqtt", cgiMqtt, NULL }, #endif - { "/web-server/upload", cgiWebServerUpload, NULL }, + { "/web-server/upload", cgiWebServerSetupUpload, NULL }, { "*.json", WEB_CgiJsonHook, NULL }, //Catch-all cgi JSON queries { "*", cgiEspFsHook, NULL }, //Catch-all cgi function for the filesystem { NULL, NULL, NULL }