Diff: web-base.c

Revision:

104:40097d08edd5

Parent:

103:91194cc19bbb

Child:

106:7cff473be687

diff -r 91194cc19bbb -r 40097d08edd5 web-base.c
--- a/web-base.c	Sat Apr 27 09:25:28 2019 +0000
+++ b/web-base.c	Sun Apr 28 08:30:52 2019 +0000
@@ -66,7 +66,7 @@
 #ifdef INCLUDE_1_WIRE
     if (HttpSameStr(pPath, "/1wire.js"     )) return HttpSameDate(WebOneWireScriptDate,  WebOneWireScriptTime,  pLastModified) ? DO_NOT_MODIFIED : DO_1WIRE_SCRIPT;
 #endif
-    return WebServerDerivedRequest(pPath, pLastModified);
+    return WebDerivedRequest(pPath, pLastModified);
 }
 static void handleQuery(int todo, char* pQuery)
 {
@@ -85,7 +85,7 @@
         case DO_1WIRE_AJAX:    WebOneWireQuery (pQuery); return;
 #endif
     }
-    WebServerDerivedGet(todo, pQuery);
+    WebDerivedGet(todo, pQuery);
 }
 static bool handlePost(int todo, int contentLength, int contentStart, int size, char* pRequestStream, uint32_t positionInRequestStream)
 {
@@ -93,7 +93,7 @@
     {
         case DO_FIRMWARE_AJAX: return WebFirmwarePost(contentLength, contentStart, size, pRequestStream, positionInRequestStream);
     }
-    return WebServerDerivedPost(todo, contentLength, size, pRequestStream, positionInRequestStream);
+    return WebDerivedPost(todo, contentLength, size, pRequestStream, positionInRequestStream);
 }
 
 static void serverRequest(int size, char* pRequestStream, uint32_t positionInRequestStream, int* pToDo, bool* pPostComplete, uint32_t* pDelayUntil)
@@ -204,10 +204,10 @@
     }
     
     //If not called then call the derived (child) module
-    WebServerDerivedReply(todo);
+    WebDerivedReply(todo);
 }
 
-int WebServerInit()
+int WebBaseInit()
 {
     HttpRequestFunction = serverRequest;
     HttpReplyFunction   = serverReply;