Change include paths

MaJerle · Sep 2, 2022 · af3ad37 · af3ad37
1 parent c2fed1a
commit af3ad37
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 51 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,7 +19,10 @@
         "lwesp_debug.h": "c",
         "lwesp_utils.h": "c",
         "stdlib.h": "c",
-        "lwesp_unicode.h": "c"
+        "lwesp_unicode.h": "c",
+        "lwesp_ping.h": "c",
+        "lwesp_threads.h": "c",
+        "lwesp_int.h": "c"
     },
     "esbonio.sphinx.confDir": ""
 }
diff --git a/lwesp/src/include/lwesp/lwesp_parser.h b/lwesp/src/include/lwesp/lwesp_parser.h
@@ -34,13 +34,13 @@
 #ifndef LWESP_HDR_PARSER_H
 #define LWESP_HDR_PARSER_H
 
+#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_private.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include "lwesp/lwesp.h"
-#include "lwesp/lwesp_private.h"
-
 int32_t lwespi_parse_number(const char** str);
 uint8_t lwespi_parse_string(const char** src, char* dst, size_t dst_len, uint8_t trim);
 uint8_t lwespi_parse_ip(const char** src, lwesp_ip_t* ip);

diff --git a/lwesp/src/include/lwesp/lwesp_private.h b/lwesp/src/include/lwesp/lwesp_private.h
@@ -36,6 +36,8 @@
 
 #include "lwesp/lwesp.h"
 #include "lwesp/lwesp_debug.h"
+#include "lwesp/lwesp_mem.h"
+#include "lwesp/lwesp_timeout.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/lwesp/lwesp.c b/lwesp/src/lwesp/lwesp.c
@@ -31,8 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp.h"
 #include "lwesp/lwesp_threads.h"
 #include "lwesp/lwesp_timeout.h"
 #include "system/lwesp_ll.h"

diff --git a/lwesp/src/lwesp/lwesp_ap.c b/lwesp/src/lwesp/lwesp_ap.c
@@ -32,7 +32,6 @@
  * Version:         v1.1.2-dev
  */
 #include "lwesp/lwesp_ap.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
 
 #if LWESP_CFG_MODE_ACCESS_POINT || __DOXYGEN__

diff --git a/lwesp/src/lwesp/lwesp_buff.c b/lwesp/src/lwesp/lwesp_buff.c
@@ -32,7 +32,6 @@
  * Version:         v1.1.2-dev
  */
 #include "lwesp/lwesp_buff.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
 
 /* --- Buffer unique part starts --- */

diff --git a/lwesp/src/lwesp/lwesp_conn.c b/lwesp/src/lwesp/lwesp_conn.c
@@ -31,10 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_conn.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
-#include "lwesp/lwesp_timeout.h"
+#include "lwesp/lwesp_conn.h"
 
 /**
  * \brief           Check if connection is closed or in closing state

diff --git a/lwesp/src/lwesp/lwesp_debug.c b/lwesp/src/lwesp/lwesp_debug.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_debug.h"
-#include "lwesp/lwesp.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_debug.h"
 
 #if LWESP_CFG_DBG || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_dhcp.c b/lwesp/src/lwesp/lwesp_dhcp.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_dhcp.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_dhcp.h"
 
 /**
  * \brief           Configure DHCP settings for station or access point (or both)

diff --git a/lwesp/src/lwesp/lwesp_dns.c b/lwesp/src/lwesp/lwesp_dns.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_dns.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_dns.h"
 
 #if LWESP_CFG_DNS || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_evt.c b/lwesp/src/lwesp/lwesp_evt.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_evt.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_evt.h"
 
 /**
  * \brief           Register event function for global (non-connection based) events

diff --git a/lwesp/src/lwesp/lwesp_hostname.c b/lwesp/src/lwesp/lwesp_hostname.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_hostname.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_hostname.h"
 
 #if LWESP_CFG_HOSTNAME || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_input.c b/lwesp/src/lwesp/lwesp_input.c
@@ -31,10 +31,9 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
+#include "lwesp/lwesp_private.h"
 #include "lwesp/lwesp_input.h"
-#include "lwesp/lwesp.h"
 #include "lwesp/lwesp_buff.h"
-#include "lwesp/lwesp_private.h"
 
 static uint32_t lwesp_recv_total_len;
 static uint32_t lwesp_recv_calls;

diff --git a/lwesp/src/lwesp/lwesp_int.c b/lwesp/src/lwesp/lwesp_int.c
@@ -33,8 +33,6 @@
  */
 #include "lwesp/lwesp_private.h"
 #include "lwesp/lwesp_int.h"
-#include "lwesp/lwesp.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_parser.h"
 #include "lwesp/lwesp_unicode.h"
 #include "system/lwesp_ll.h"

diff --git a/lwesp/src/lwesp/lwesp_mdns.c b/lwesp/src/lwesp/lwesp_mdns.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_mdns.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_mdns.h"
 
 #if LWESP_CFG_MDNS || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_mem.c b/lwesp/src/lwesp/lwesp_mem.c
@@ -32,8 +32,8 @@
  * Version:         v1.1.2-dev
  */
 #include <limits.h>
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_mem.h"
 
 #if !LWESP_CFG_MEM_CUSTOM || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_parser.c b/lwesp/src/lwesp/lwesp_parser.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_parser.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_parser.h"
 
 /* Increase pointer if matches character value */
 #define INC_IF_CHAR_EQUAL(p, ch)                                                                                       \

diff --git a/lwesp/src/lwesp/lwesp_pbuf.c b/lwesp/src/lwesp/lwesp_pbuf.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_pbuf.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_pbuf.h"
 
 /* Set size of pbuf structure */
 #define SIZEOF_PBUF_STRUCT LWESP_MEM_ALIGN(sizeof(lwesp_pbuf_t))

diff --git a/lwesp/src/lwesp/lwesp_ping.c b/lwesp/src/lwesp/lwesp_ping.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_ping.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_ping.h"
 
 #if LWESP_CFG_PING || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_server.c b/lwesp/src/lwesp/lwesp_server.c
@@ -31,8 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_server.h"
 
 /**
  * \brief           Enables or disables server mode

diff --git a/lwesp/src/lwesp/lwesp_smart.c b/lwesp/src/lwesp/lwesp_smart.c
@@ -32,9 +32,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_smart.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_smart.h"
 
 #if LWESP_CFG_SMART || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_sntp.c b/lwesp/src/lwesp/lwesp_sntp.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_sntp.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_sntp.h"
 
 #if LWESP_CFG_SNTP || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_sta.c b/lwesp/src/lwesp/lwesp_sta.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_sta.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_sta.h"
 
 #if LWESP_CFG_MODE_STATION || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_threads.c b/lwesp/src/lwesp/lwesp_threads.c
@@ -32,11 +32,8 @@
  * Version:         v1.1.2-dev
  */
 #include "lwesp/lwesp_threads.h"
-#include "lwesp/lwesp.h"
-#include "lwesp/lwesp_int.h"
-#include "lwesp/lwesp_mem.h"
-#include "lwesp/lwesp_parser.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_int.h"
 #include "lwesp/lwesp_timeout.h"
 #include "system/lwesp_sys.h"
 

diff --git a/lwesp/src/lwesp/lwesp_timeout.c b/lwesp/src/lwesp/lwesp_timeout.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_timeout.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_timeout.h"
 
 static lwesp_timeout_t* first_timeout;
 static uint32_t last_timeout_time;

diff --git a/lwesp/src/lwesp/lwesp_unicode.c b/lwesp/src/lwesp/lwesp_unicode.c
@@ -31,8 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_unicode.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_unicode.h"
 
 /**
  * \brief           Decode single character for unicode (UTF-8 only) format

diff --git a/lwesp/src/lwesp/lwesp_webserver.c b/lwesp/src/lwesp/lwesp_webserver.c
@@ -32,9 +32,8 @@
  * Author:          Neo Xiong <xiongyu0523@gmail.com>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_webserver.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_webserver.h"
 
 #if LWESP_CFG_WEBSERVER || __DOXYGEN__
 

diff --git a/lwesp/src/lwesp/lwesp_wps.c b/lwesp/src/lwesp/lwesp_wps.c
@@ -31,9 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_wps.h"
-#include "lwesp/lwesp_mem.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_wps.h"
 
 #if LWESP_CFG_WPS || __DOXYGEN__