Apply new .clang-format

MaJerle · May 28, 2023 · 8c59745 · 8c59745
1 parent a7fe82e
commit 8c59745
Show file tree

Hide file tree

Showing 36 changed files with 76 additions and 133 deletions.
diff --git a/.clang-format b/.clang-format
@@ -16,14 +16,14 @@ AlignConsecutiveBitFields:
 AlignConsecutiveDeclarations: None
 AlignEscapedNewlines: Right
 AlignOperands: Align
-SortIncludes: false
+SortIncludes: true
 InsertBraces: true # Control statements must have curly brackets
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Empty
-AllowShortCaseLabelsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never

diff --git a/lwesp/src/api/lwesp_netconn.c b/lwesp/src/api/lwesp_netconn.c
@@ -244,8 +244,7 @@ netconn_evt(lwesp_evt_t* evt) {
 
             break;
         }
-        default:
-            return lwespERR;
+        default: return lwespERR;
     }
     return lwespOK;
 }
@@ -269,8 +268,7 @@ lwesp_evt(lwesp_evt_t* evt) {
                 lwesp_sys_mbox_putnow(&listen_api->mbox_accept, &recv_not_present);
             }
         }
-        default:
-            break;
+        default: break;
     }
     return lwespOK;
 }

diff --git a/lwesp/src/apps/cayenne/lwesp_cayenne.c b/lwesp/src/apps/cayenne/lwesp_cayenne.c
@@ -244,8 +244,7 @@ lwesp_cayenne_parse_payload(lwesp_cayenne_t* c, const char* payload, size_t payl
             LWESP_DEBUGF(LWESP_CFG_DBG_CAYENNE_TRACE, "[LWESP CAYENNE] Topic is analog\r\n");
             /* Here parse type,value */
         }
-        default:
-            break;
+        default: break;
     }
     return lwespOK;
 }
@@ -565,8 +564,7 @@ prv_mqtt_client_evt_cb(lwesp_mqtt_client_p client, lwesp_mqtt_evt_t* evt) {
             prv_try_send_data(c); /* Try to send data */
             break;
         }
-        default:
-            break;
+        default: break;
     }
 }
 
@@ -585,8 +583,7 @@ prv_global_evt_cb(lwesp_evt_t* evt) {
             }
             break;
         }
-        default:
-            break;
+        default: break;
     }
     return lwespOK;
 }

diff --git a/lwesp/src/apps/http_server/lwesp_http_server.c b/lwesp/src/apps/http_server/lwesp_http_server.c
@@ -687,8 +687,7 @@ send_response_ssi(http_state_t* hs) {
                     }
                     break;
                 }
-                default:
-                    break;
+                default: break;
             }
 
             if (reset) {
@@ -1109,8 +1108,7 @@ http_evt(lwesp_evt_t* evt) {
             }
             break;
         }
-        default:
-            break;
+        default: break;
     }
 
     if (close) {                   /* Do we have to close a connection? */

diff --git a/lwesp/src/apps/mqtt/lwesp_mqtt_client.c b/lwesp/src/apps/mqtt/lwesp_mqtt_client.c
@@ -292,11 +292,8 @@ prv_write_fixed_header(lwesp_mqtt_client_p client, mqtt_msg_type_t type, uint8_t
             break;
         case MQTT_MSG_TYPE_PUBREL:
         case MQTT_MSG_TYPE_SUBSCRIBE:
-        case MQTT_MSG_TYPE_UNSUBSCRIBE:
-            b |= LWESP_U8(LWESP_MQTT_QOS_AT_LEAST_ONCE) << 0x01;
-            break;
-        default:
-            break;
+        case MQTT_MSG_TYPE_UNSUBSCRIBE: b |= LWESP_U8(LWESP_MQTT_QOS_AT_LEAST_ONCE) << 0x01; break;
+        default: break;
     }
     lwesp_buff_write(&client->tx_buff, &b, 1); /* Write start of packet parameters */
 
@@ -659,8 +656,7 @@ prv_mqtt_process_incoming_message(lwesp_mqtt_client_p client) {
             }
             break;
         }
-        default:
-            return 0;
+        default: return 0;
     }
     return 1;
 }
@@ -765,8 +761,7 @@ prv_mqtt_parse_incoming(lwesp_mqtt_client_p client, lwesp_pbuf_p pbuf) {
                     }
                     break;
                 }
-                default:
-                    client->parser_state = MQTT_PARSER_STATE_INIT;
+                default: client->parser_state = MQTT_PARSER_STATE_INIT;
             }
         }
     } while (buff_len > 0);
@@ -1080,8 +1075,7 @@ prv_mqtt_conn_cb(lwesp_evt_t* evt) {
                                lwesp_evt_conn_close_is_forced(evt));
             break;
         }
-        default:
-            break;
+        default: break;
     }
     return lwespOK;
 }

diff --git a/lwesp/src/apps/mqtt/lwesp_mqtt_client_api.c b/lwesp/src/apps/mqtt/lwesp_mqtt_client_api.c
@@ -186,8 +186,7 @@ prv_mqtt_evt(lwesp_mqtt_client_p client, lwesp_mqtt_evt_t* evt) {
             prv_release_sem(api_client); /* Release semaphore */
             break;
         }
-        default:
-            break;
+        default: break;
     }
 }
 

diff --git a/lwesp/src/cli/cli_input.c b/lwesp/src/cli/cli_input.c
@@ -237,9 +237,7 @@ cli_in_data(cli_printf cliprintf, char ch) {
                 }
                 break;
             /* Tab for autocomplete */
-            case '\t':
-                cli_tab_auto_complete(cliprintf, cmd_buffer, &cmd_pos, (last_ch == '\t'));
-                break;
+            case '\t': cli_tab_auto_complete(cliprintf, cmd_buffer, &cmd_pos, (last_ch == '\t')); break;
             /* New line -> new command */
             case '\n':
             case '\r':

diff --git a/lwesp/src/include/lwesp/apps/lwesp_apps.h b/lwesp/src/include/lwesp/apps/lwesp_apps.h
@@ -34,8 +34,8 @@
 #ifndef LWESP_APPS_HDR_H
 #define LWESP_APPS_HDR_H
 
-#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_buff.h b/lwesp/src/include/lwesp/lwesp_buff.h
@@ -56,7 +56,7 @@ extern "C" {
  *
  * \note            Modification of this macro must be done in header and source file aswell
  */
-#define BUF_PREF(x) lwesp_ ## x
+#define BUF_PREF(x) lwesp_##x
 /* --- Buffer unique part ends --- */
 
 uint8_t BUF_PREF(buff_init)(BUF_PREF(buff_t) * buff, size_t size);

diff --git a/lwesp/src/include/lwesp/lwesp_includes.h b/lwesp/src/include/lwesp/lwesp_includes.h
@@ -37,13 +37,13 @@
 #include "lwesp/lwesp_opt.h"
 #include "lwesp/lwesp_types.h"
 
-#include "lwesp/lwesp_debug.h"
 #include "lwesp/lwesp_buff.h"
 #include "lwesp/lwesp_conn.h"
+#include "lwesp/lwesp_debug.h"
 #include "lwesp/lwesp_evt.h"
 #include "lwesp/lwesp_input.h"
-#include "lwesp/lwesp_pbuf.h"
 #include "lwesp/lwesp_mem.h"
+#include "lwesp/lwesp_pbuf.h"
 #include "lwesp/lwesp_server.h"
 #include "lwesp/lwesp_utils.h"
 #include "system/lwesp_sys.h"

diff --git a/lwesp/src/include/lwesp/lwesp_parser.h b/lwesp/src/include/lwesp/lwesp_parser.h
@@ -34,8 +34,8 @@
 #ifndef LWESP_PARSER_HDR_H
 #define LWESP_PARSER_HDR_H
 
-#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp_private.h"
+#include "lwesp/lwesp_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lwesp/src/include/lwesp/lwesp_private.h b/lwesp/src/include/lwesp/lwesp_private.h
@@ -34,15 +34,15 @@
 #ifndef LWESP_PRIV_HDR_H
 #define LWESP_PRIV_HDR_H
 
-#include "lwesp/lwesp_opt.h"
-#include "lwesp/lwesp_types.h"
-#include "lwesp/lwesp_debug.h"
+#include "lwesp/lwesp.h"
 #include "lwesp/lwesp_buff.h"
+#include "lwesp/lwesp_debug.h"
+#include "lwesp/lwesp_includes.h"
 #include "lwesp/lwesp_mem.h"
-#include "lwesp/lwesp.h"
+#include "lwesp/lwesp_opt.h"
 #include "lwesp/lwesp_timeout.h"
+#include "lwesp/lwesp_types.h"
 #include "lwesp/lwesp_utils.h"
-#include "lwesp/lwesp_includes.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_private.h"
 #include "lwesp/lwesp.h"
+#include "lwesp/lwesp_private.h"
 #include "lwesp/lwesp_threads.h"
 #include "lwesp/lwesp_timeout.h"
 #include "system/lwesp_ll.h"

diff --git a/lwesp/src/lwesp/lwesp_conn.c b/lwesp/src/lwesp/lwesp_conn.c
@@ -31,8 +31,8 @@
  * Author:          Tilen MAJERLE <tilen@majerle.eu>
  * Version:         v1.1.2-dev
  */
-#include "lwesp/lwesp_private.h"
 #include "lwesp/lwesp_conn.h"
+#include "lwesp/lwesp_private.h"
 
 /**
  * \brief           Check if connection is closed or in closing state
@@ -612,18 +612,12 @@ lwesp_conn_set_ssl_buffersize(size_t size, const uint32_t blocking) {
 lwesp_conn_p
 lwesp_conn_get_from_evt(lwesp_evt_t* evt) {
     switch (evt->type) {
-        case LWESP_EVT_CONN_ACTIVE:
-            return lwesp_evt_conn_active_get_conn(evt);
-        case LWESP_EVT_CONN_CLOSE:
-            return lwesp_evt_conn_close_get_conn(evt);
-        case LWESP_EVT_CONN_RECV:
-            return lwesp_evt_conn_recv_get_conn(evt);
-        case LWESP_EVT_CONN_SEND:
-            return lwesp_evt_conn_send_get_conn(evt);
-        case LWESP_EVT_CONN_POLL:
-            return lwesp_evt_conn_poll_get_conn(evt);
-        default:
-            return NULL;
+        case LWESP_EVT_CONN_ACTIVE: return lwesp_evt_conn_active_get_conn(evt);
+        case LWESP_EVT_CONN_CLOSE: return lwesp_evt_conn_close_get_conn(evt);
+        case LWESP_EVT_CONN_RECV: return lwesp_evt_conn_recv_get_conn(evt);
+        case LWESP_EVT_CONN_SEND: return lwesp_evt_conn_send_get_conn(evt);
+        case LWESP_EVT_CONN_POLL: return lwesp_evt_conn_poll_get_conn(evt);
+        default: return NULL;
     }
 }
 

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

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

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

diff --git a/lwesp/src/lwesp/lwesp_input.c b/lwesp/src/lwesp/lwesp_input.c
@@ -31,9 +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_buff.h"
+#include "lwesp/lwesp_private.h"
 
 static uint32_t lwesp_recv_total_len;
 static uint32_t lwesp_recv_calls;