Merge pull request #101 from lasselukkari/remove-size

Remove unnecessary SIZE macro
lasselukkari · Feb 17, 2021 · 6c2f06f · 6c2f06f
2 parents 9109e68 + 5497652
commit 6c2f06f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=aWOT
-version=3.2.2
+version=3.2.3
 author=Lasse Lukkari <lasse.lukkari@gmail.com>
 maintainer=Lasse Lukkari <lasse.lukkari@gmail.com>
 sentence=Arduino web server library.

diff --git a/src/aWOT.cpp b/src/aWOT.cpp
@@ -114,7 +114,7 @@ void Response::sendStatus(int code) {
 }
 
 void Response::set(const char *name, const char *value) {
-  if (m_headersCount >= SIZE(m_headers)) {
+  if (m_headersCount >= SERVER_MAX_HEADERS) {
     return;
   }
 
@@ -827,8 +827,8 @@ void Request::push(uint8_t ch) {
   m_pushback[m_pushbackDepth++] = ch;
 
   // can't raise error here, so just replace last char over and over
-  if (m_pushbackDepth == SIZE(m_pushback)) {
-    m_pushbackDepth = SIZE(m_pushback) - 1;
+  if (m_pushbackDepth == SERVER_PUSHBACK_BUFFER_SIZE) {
+    m_pushbackDepth = SERVER_PUSHBACK_BUFFER_SIZE - 1;
   }
 }
 

diff --git a/src/aWOT.h b/src/aWOT.h
@@ -69,7 +69,6 @@
 #endif
 
 #define P(name) static const unsigned char name[] PROGMEM
-#define SIZE(array) (sizeof(array) / sizeof(*array))
 
 class StreamClient : public Client {
  private: