Migrate from astyle to clang-format (#8464)

.github/workflows/pull-request.yml

@@ -238,11 +238,20 @@ jobs:
         python-version: '3.x'
     - name: Style check
       env:
+        LLVM_SNAPSHOT_KEY: "6084F3CF814B57C1CF12EFD515CF4D18AF4F7421"
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
         TRAVIS_TAG: ${{ github.ref }}
       run: |
+          export GNUPGHOME=$(mktemp -d)
+          gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$LLVM_SNAPSHOT_KEY"
+          gpg --batch --armor --export "$LLVM_SNAPSHOT_KEY" | \
+            sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.gpg.asc
+          rm -r $GNUPGHOME
+          echo "deb http://apt.llvm.org/focal/     llvm-toolchain-focal-13   main" | \
+            sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt update
-          sudo apt install astyle
+          sudo apt install clang-format-13
+          pip3 install pyyaml
           bash ./tests/ci/style_check.sh
 
 

cores/esp8266/LwipDhcpServer-NonOS.cpp

@@ -35,7 +35,6 @@ DhcpServer dhcpSoftAP(&netif_git[SOFTAP_IF]);
 
 extern "C"
 {
-
     void dhcps_start(struct ip_info* info, netif* apnetif)
     {
         // apnetif is esp interface, replaced by lwip2's

cores/esp8266/LwipDhcpServer.cpp

@@ -107,7 +107,6 @@ struct dhcps_pool
     uint32           lease_timer;
     dhcps_type_t     type;
     dhcps_state_t    state;
-
 };
 
 #define DHCPS_LEASE_TIMER dhcps_lease_time  // 0x05A0
@@ -162,7 +161,16 @@ const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;
 #endif
 
 #if DHCPS_DEBUG
-#define LWIP_IS_OK(what,err) ({ int ret = 1, errval = (err); if (errval != ERR_OK) { os_printf("DHCPS ERROR: %s (lwip:%d)\n", what, errval); ret = 0; } ret; })
+#define LWIP_IS_OK(what, err)                                                                      \
+    ({                                                                                             \
+        int ret = 1, errval = (err);                                                               \
+        if (errval != ERR_OK)                                                                      \
+        {                                                                                          \
+            os_printf("DHCPS ERROR: %s (lwip:%d)\n", what, errval);                                \
+            ret = 0;                                                                               \
+        }                                                                                          \
+        ret;                                                                                       \
+    })
 #else
 #define LWIP_IS_OK(what, err) ((err) == ERR_OK)
 #endif
@@ -188,8 +196,7 @@ DhcpServer::DhcpServer(netif* netif): _netif(netif)
         // 1. `fw_has_started_softap_dhcps` is already initialized to 1
         // 2. global ctor DhcpServer's `dhcpSoftAP(&netif_git[SOFTAP_IF])` is called
         // 3. (that's here) => begin(legacy-values) is called
-        ip_info ip =
+        ip_info ip = {
-        {
             { 0x0104a8c0 },  // IP 192.168.4.1
             { 0x00ffffff },  // netmask 255.255.255.0
             { 0 }            // gateway 0.0.0.0
@@ -361,7 +368,6 @@ bool DhcpServer::add_dhcps_lease(uint8 *macaddr)
 ///////////////////////////////////////////////////////////////////////////////////
 uint8_t* DhcpServer::add_msg_type(uint8_t* optptr, uint8_t type)
 {
-
     *optptr++ = DHCP_OPTION_MSG_TYPE;
     *optptr++ = 1;
     *optptr++ = type;
@@ -485,7 +491,6 @@ uint8_t* DhcpServer::add_offer_options(uint8_t *optptr)
 ///////////////////////////////////////////////////////////////////////////////////
 uint8_t* DhcpServer::add_end(uint8_t* optptr)
 {
-
     *optptr++ = DHCP_OPTION_END;
     return optptr;
 }
@@ -539,7 +544,6 @@ void DhcpServer::send_offer(struct dhcps_msg *m)
 #endif
     if (p != nullptr)
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_offer>>pbuf_alloc succeed\n");
         os_printf("dhcps: send_offer>>p->tot_len = %d\n", p->tot_len);
@@ -559,7 +563,6 @@ void DhcpServer::send_offer(struct dhcps_msg *m)
     }
     else
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_offer>>pbuf_alloc failed\n");
 #endif
@@ -588,7 +591,6 @@ void DhcpServer::send_offer(struct dhcps_msg *m)
 ///////////////////////////////////////////////////////////////////////////////////
 void DhcpServer::send_nak(struct dhcps_msg* m)
 {
-
     u8_t*        end;
     struct pbuf *p, *q;
     u8_t*        data;
@@ -605,7 +607,6 @@ void DhcpServer::send_nak(struct dhcps_msg *m)
 #endif
     if (p != nullptr)
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_nak>>pbuf_alloc succeed\n");
         os_printf("dhcps: send_nak>>p->tot_len = %d\n", p->tot_len);
@@ -625,7 +626,6 @@ void DhcpServer::send_nak(struct dhcps_msg *m)
     }
     else
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_nak>>pbuf_alloc failed\n");
 #endif
@@ -649,7 +649,6 @@ void DhcpServer::send_nak(struct dhcps_msg *m)
 ///////////////////////////////////////////////////////////////////////////////////
 void DhcpServer::send_ack(struct dhcps_msg* m)
 {
-
     u8_t*        end;
     struct pbuf *p, *q;
     u8_t*        data;
@@ -667,7 +666,6 @@ void DhcpServer::send_ack(struct dhcps_msg *m)
 #endif
     if (p != nullptr)
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_ack>>pbuf_alloc succeed\n");
         os_printf("dhcps: send_ack>>p->tot_len = %d\n", p->tot_len);
@@ -687,13 +685,13 @@ void DhcpServer::send_ack(struct dhcps_msg *m)
     }
     else
     {
-
 #if DHCPS_DEBUG
         os_printf("dhcps: send_ack>>pbuf_alloc failed\n");
 #endif
         return;
     }
-    if (!LWIP_IS_OK("dhcps send ack", udp_sendto(pcb_dhcps, p, &broadcast_dhcps, DHCPS_CLIENT_PORT)))
+    if (!LWIP_IS_OK("dhcps send ack",
+                    udp_sendto(pcb_dhcps, p, &broadcast_dhcps, DHCPS_CLIENT_PORT)))
     {
 #if DHCPS_DEBUG
         os_printf("dhcps: send_ack>>udp_sendto\n");
@@ -738,7 +736,6 @@ uint8_t DhcpServer::parse_options(uint8_t *optptr, sint16_t len)
 #endif
         switch ((sint16_t)*optptr)
         {
-
         case DHCP_OPTION_MSG_TYPE:  // 53
             type = *(optptr + 2);
             break;
@@ -824,9 +821,7 @@ uint8_t DhcpServer::parse_options(uint8_t *optptr, sint16_t len)
 ///////////////////////////////////////////////////////////////////////////////////
 sint16_t DhcpServer::parse_msg(struct dhcps_msg* m, u16_t len)
 {
-    if (memcmp((char *)m->options,
+    if (memcmp((char*)m->options, &magic_cookie, sizeof(magic_cookie)) == 0)
-               &magic_cookie,
-               sizeof(magic_cookie)) == 0)
     {
         struct ipv4_addr ip;
         memcpy(&ip.addr, m->ciaddr, sizeof(ip.addr));
@@ -857,20 +852,14 @@ sint16_t DhcpServer::parse_msg(struct dhcps_msg *m, u16_t len)
 */
 ///////////////////////////////////////////////////////////////////////////////////
 
-void DhcpServer::S_handle_dhcp(void *arg,
+void DhcpServer::S_handle_dhcp(void* arg, struct udp_pcb* pcb, struct pbuf* p,
-                               struct udp_pcb *pcb,
+                               const ip_addr_t* addr, uint16_t port)
-                               struct pbuf *p,
-                               const ip_addr_t *addr,
-                               uint16_t port)
 {
     DhcpServer* instance = reinterpret_cast<DhcpServer*>(arg);
     instance->handle_dhcp(pcb, p, addr, port);
 }
 
-void DhcpServer::handle_dhcp(
+void DhcpServer::handle_dhcp(struct udp_pcb* pcb, struct pbuf* p, const ip_addr_t* addr,
-    struct udp_pcb *pcb,
-    struct pbuf *p,
-    const ip_addr_t *addr,
                              uint16_t port)
 {
     (void)pcb;
@@ -933,7 +922,6 @@ void DhcpServer::handle_dhcp(
 
     switch (parse_msg(pmsg_dhcps, tlen - 240))
     {
-
     case DHCPS_STATE_OFFER:  // 1
 #if DHCPS_DEBUG
         os_printf("dhcps: handle_dhcp-> DHCPD_STATE_OFFER\n");
@@ -1048,7 +1036,8 @@ bool DhcpServer::begin(struct ip_info *info)
     udp_bind(pcb_dhcps, IP_ADDR_ANY, DHCPS_SERVER_PORT);
     udp_recv(pcb_dhcps, S_handle_dhcp, this);
 #if DHCPS_DEBUG
-    os_printf("dhcps:dhcps_start->udp_recv function Set a receive callback handle_dhcp for UDP_PCB pcb_dhcps\n");
+    os_printf("dhcps:dhcps_start->udp_recv function Set a receive callback handle_dhcp for UDP_PCB "
+              "pcb_dhcps\n");
 #endif
 
     if (_netif->num == SOFTAP_IF)
@@ -1107,7 +1096,6 @@ bool DhcpServer::isRunning()
     return !!_netif->state;
 }
 
-
 /******************************************************************************
     FunctionName : set_dhcps_lease
     Description  : set the lease information of DHCP server
@@ -1151,8 +1139,7 @@ bool DhcpServer::set_dhcps_lease(struct dhcps_lease *please)
 
         /*config ip information must be in the same segment as the local ip*/
         softap_ip >>= 8;
-        if ((start_ip >> 8 != softap_ip)
+        if ((start_ip >> 8 != softap_ip) || (end_ip >> 8 != softap_ip))
-                || (end_ip >> 8 != softap_ip))
         {
             return false;
         }
@@ -1244,7 +1231,8 @@ void DhcpServer::kill_oldest_dhcps_pool(void)
         pre = p;
         p   = p->pnext;
     }
-    minpre->pnext = minp->pnext; pdhcps_pool->state = DHCPS_STATE_OFFLINE;
+    minpre->pnext      = minp->pnext;
+    pdhcps_pool->state = DHCPS_STATE_OFFLINE;
     free(minp->pnode);
     minp->pnode = nullptr;
     free(minp);
@@ -1531,7 +1519,6 @@ uint32 DhcpServer::dhcps_client_update(u8 *bssid, struct ipv4_addr *ip)
             pdhcps_pool->lease_timer = DHCPS_LEASE_TIMER;
             pdhcps_pool->type        = type;
             pdhcps_pool->state       = DHCPS_STATE_ONLINE;
-
         }
         else
         {

cores/esp8266/LwipDhcpServer.h

@@ -36,7 +36,6 @@
 class DhcpServer
 {
 public:
-
     DhcpServer(netif* netif);
     ~DhcpServer();
 
@@ -65,7 +64,6 @@ public:
     void dhcps_set_dns(int num, const ipv4_addr_t* dns);
 
 protected:
-
     // legacy C structure and API to eventually turn into C++
 
     typedef struct _list_node
@@ -85,16 +83,9 @@ protected:
     void        send_ack(struct dhcps_msg* m);
     uint8_t     parse_options(uint8_t* optptr, sint16_t len);
     sint16_t    parse_msg(struct dhcps_msg* m, u16_t len);
-    static void S_handle_dhcp(void *arg,
+    static void S_handle_dhcp(void* arg, struct udp_pcb* pcb, struct pbuf* p, const ip_addr_t* addr,
-                              struct udp_pcb *pcb,
-                              struct pbuf *p,
-                              const ip_addr_t *addr,
-                              uint16_t port);
-    void handle_dhcp(
-        struct udp_pcb *pcb,
-        struct pbuf *p,
-        const ip_addr_t *addr,
                               uint16_t port);
+    void   handle_dhcp(struct udp_pcb* pcb, struct pbuf* p, const ip_addr_t* addr, uint16_t port);
     void   kill_oldest_dhcps_pool(void);
     void   dhcps_coarse_tmr(void);  // CURRENTLY NOT CALLED
     void   dhcps_client_leave(u8* bssid, struct ipv4_addr* ip, bool force);

cores/esp8266/LwipIntf.cpp

@@ -1,5 +1,6 @@
 
-extern "C" {
+extern "C"
+{
 #include "lwip/err.h"
 #include "lwip/ip_addr.h"
 #include "lwip/dns.h"
@@ -24,10 +25,12 @@ extern "C" {
 //
 // result stored into gateway/netmask/dns1
 
-bool LwipIntf::ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2, const IPAddress& arg3,
+bool LwipIntf::ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1,
-                                IPAddress& gateway, IPAddress& netmask, IPAddress& dns1)
+                                const IPAddress& arg2, const IPAddress& arg3, IPAddress& gateway,
+                                IPAddress& netmask, IPAddress& dns1)
 {
-    //To allow compatibility, check first octet of 3rd arg. If 255, interpret as ESP order, otherwise Arduino order.
+    // To allow compatibility, check first octet of 3rd arg. If 255, interpret as ESP order,
+    // otherwise Arduino order.
     gateway = arg1;
     netmask = arg2;
     dns1    = arg3;
@@ -36,7 +39,9 @@ bool LwipIntf::ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1
     {
         // octet is not 255 => interpret as Arduino order
         gateway = arg2;
-        netmask = arg3[0] == 0 ? IPAddress(255, 255, 255, 0) : arg3; //arg order is arduino and 4th arg not given => assign it arduino default
+        netmask = arg3[0] == 0 ? IPAddress(255, 255, 255, 0)
+                               : arg3;  // arg order is arduino and 4th arg not given => assign it
+                                        // arduino default
         dns1 = arg1;
     }
 
@@ -143,7 +148,6 @@ bool LwipIntf::hostname(const char* aHostname)
     // harmless for AP, also compatible with ethernet adapters (to come)
     for (netif* intf = netif_list; intf; intf = intf->next)
     {
-
         // unconditionally update all known interfaces
         intf->hostname = wifi_station_get_hostname();
 
@@ -162,4 +166,3 @@ bool LwipIntf::hostname(const char* aHostname)
 
     return ret && compliant;
 }
-

cores/esp8266/LwipIntf.h

@@ -10,7 +10,6 @@
 class LwipIntf
 {
 public:
-
     using CBType = std::function<void(netif*)>;
 
     static bool stateUpCB(LwipIntf::CBType&& cb);
@@ -24,9 +23,9 @@ public:
     // arg3     | dns1       netmask
     //
     // result stored into gateway/netmask/dns1
-    static
+    static bool ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1,
-    bool ipAddressReorder(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2, const IPAddress& arg3,
+                                 const IPAddress& arg2, const IPAddress& arg3, IPAddress& gateway,
-                          IPAddress& gateway, IPAddress& netmask, IPAddress& dns1);
+                                 IPAddress& netmask, IPAddress& dns1);
 
     String hostname();
     bool   hostname(const String& aHostname)
@@ -42,7 +41,6 @@ public:
     const char* getHostname();
 
 protected:
-
     static bool stateChangeSysCB(LwipIntf::CBType&& cb);
 };
 

cores/esp8266/LwipIntfCB.cpp

@@ -33,10 +33,12 @@ bool LwipIntf::stateChangeSysCB(LwipIntf::CBType&& cb)
 
 bool LwipIntf::stateUpCB(LwipIntf::CBType&& cb)
 {
-    return stateChangeSysCB([cb](netif * nif)
+    return stateChangeSysCB(
+        [cb](netif* nif)
         {
             if (netif_is_up(nif))
-            schedule_function([cb, nif]()
+                schedule_function(
+                    [cb, nif]()
                     {
                         cb(nif);
                     });

cores/esp8266/LwipIntfDev.h

@@ -28,20 +28,15 @@
 template<class RawDev>
 class LwipIntfDev: public LwipIntf, public RawDev
 {
-
 public:
-
     LwipIntfDev(int8_t cs = SS, SPIClass& spi = SPI, int8_t intr = -1) :
-        RawDev(cs, spi, intr),
+        RawDev(cs, spi, intr), _mtu(DEFAULT_MTU), _intrPin(intr), _started(false), _default(false)
-        _mtu(DEFAULT_MTU),
-        _intrPin(intr),
-        _started(false),
-        _default(false)
     {
         memset(&_netif, 0, sizeof(_netif));
     }
 
-    boolean config(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2, const IPAddress& arg3 = IPADDR_NONE, const IPAddress& dns2 = IPADDR_NONE);
+    boolean config(const IPAddress& local_ip, const IPAddress& arg1, const IPAddress& arg2,
+                   const IPAddress& arg3 = IPADDR_NONE, const IPAddress& dns2 = IPADDR_NONE);
 
     // default mac-address is inferred from esp8266's STA interface
     boolean begin(const uint8_t* macAddress = nullptr, const uint16_t mtu = DEFAULT_MTU);
@@ -77,7 +72,6 @@ public:
     wl_status_t status();
 
 protected:
-
     err_t netif_init();
     void  netif_status_callback();
 
@@ -97,11 +91,12 @@ protected:
     uint8_t  _macAddress[6];
     bool     _started;
     bool     _default;
-
 };
 
 template<class RawDev>
-boolean LwipIntfDev<RawDev>::config(const IPAddress& localIP, const IPAddress& gateway, const IPAddress& netmask, const IPAddress& dns1, const IPAddress& dns2)
+boolean LwipIntfDev<RawDev>::config(const IPAddress& localIP, const IPAddress& gateway,
+                                    const IPAddress& netmask, const IPAddress& dns1,
+                                    const IPAddress& dns2)
 {
     if (_started)
     {
@@ -183,7 +178,8 @@ boolean LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu
     ip_addr_copy(netmask, _netif.netmask);
     ip_addr_copy(gw, _netif.gw);
 
-    if (!netif_add(&_netif, ip_2_ip4(&ip_addr), ip_2_ip4(&netmask), ip_2_ip4(&gw), this, netif_init_s, ethernet_input))
+    if (!netif_add(&_netif, ip_2_ip4(&ip_addr), ip_2_ip4(&netmask), ip_2_ip4(&gw), this,
+                   netif_init_s, ethernet_input))
     {
         return false;
     }
@@ -216,16 +212,20 @@ boolean LwipIntfDev<RawDev>::begin(const uint8_t* macAddress, const uint16_t mtu
         }
         else
         {
-            ::printf((PGM_P)F("lwIP_Intf: Interrupt not implemented yet, enabling transparent polling\r\n"));
+            ::printf((PGM_P)F(
+                "lwIP_Intf: Interrupt not implemented yet, enabling transparent polling\r\n"));
             _intrPin = -1;
         }
     }
 
-    if (_intrPin < 0 && !schedule_recurrent_function_us([&]()
+    if (_intrPin < 0
+        && !schedule_recurrent_function_us(
+            [&]()
             {
                 this->handlePackets();
                 return true;
-    }, 100))
+            },
+            100))
     {
         netif_remove(&_netif);
         return false;
@@ -255,7 +255,8 @@ err_t LwipIntfDev<RawDev>::linkoutput_s(netif *netif, struct pbuf *pbuf)
 #if PHY_HAS_CAPTURE
     if (phy_capture)
     {
-        phy_capture(ths->_netif.num, (const char*)pbuf->payload, pbuf->len, /*out*/1, /*success*/len == pbuf->len);
+        phy_capture(ths->_netif.num, (const char*)pbuf->payload, pbuf->len, /*out*/ 1,
+                    /*success*/ len == pbuf->len);
     }
 #endif
 
@@ -281,11 +282,7 @@ err_t LwipIntfDev<RawDev>::netif_init()
     _netif.name[1]      = '0' + _netif.num;
     _netif.mtu          = _mtu;
     _netif.chksum_flags = NETIF_CHECKSUM_ENABLE_ALL;
-    _netif.flags =
+    _netif.flags = NETIF_FLAG_ETHARP | NETIF_FLAG_IGMP | NETIF_FLAG_BROADCAST | NETIF_FLAG_LINK_UP;
-        NETIF_FLAG_ETHARP
-        | NETIF_FLAG_IGMP
-        | NETIF_FLAG_BROADCAST
-        | NETIF_FLAG_LINK_UP;
 
     // lwIP's doc: This function typically first resolves the hardware
     // address, then sends the packet.  For ethernet physical layer, this is
@@ -374,7 +371,8 @@ err_t LwipIntfDev<RawDev>::handlePackets()
 #if PHY_HAS_CAPTURE
         if (phy_capture)
         {
-            phy_capture(_netif.num, (const char*)pbuf->payload, tot_len, /*out*/0, /*success*/err == ERR_OK);
+            phy_capture(_netif.num, (const char*)pbuf->payload, tot_len, /*out*/ 0,
+                        /*success*/ err == ERR_OK);
         }
 #endif
 
@@ -384,7 +382,6 @@ err_t LwipIntfDev<RawDev>::handlePackets()
             return err;
         }
         // (else) allocated pbuf is now lwIP's responsibility
-
     }
 }
 

cores/esp8266/StreamSend.cpp

@@ -19,13 +19,10 @@
     parsing functions based on TextFinder library by Michael Margolis
 */
 
-
 #include <Arduino.h>
 #include <StreamDev.h>
 
-size_t Stream::sendGeneric(Print* to,
+size_t Stream::sendGeneric(Print* to, const ssize_t len, const int readUntilChar,
-                           const ssize_t len,
-                           const int readUntilChar,
                            const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
 {
     setReport(Report::Success);
@@ -57,11 +54,14 @@ size_t Stream::sendGeneric(Print* to,
     return SendGenericRegular(to, len, timeoutMs);
 }
 
-
+size_t
-size_t Stream::SendGenericPeekBuffer(Print* to, const ssize_t len, const int readUntilChar, const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
+Stream::SendGenericPeekBuffer(Print* to, const ssize_t len, const int readUntilChar,
+                              const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
 {
     // "neverExpires (default, impossible)" is translated to default timeout
-    esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout() : timeoutMs);
+    esp8266::polledTimeout::oneShotFastMs timedOut(
+        timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
+                                                                         : timeoutMs);
     // len==-1 => maxLen=0 <=> until starvation
     const size_t maxLen  = std::max((ssize_t)0, len);
     size_t       written = 0;
@@ -145,13 +145,17 @@ size_t Stream::SendGenericPeekBuffer(Print* to, const ssize_t len, const int rea
     return written;
 }
 
-size_t Stream::SendGenericRegularUntil(Print* to, const ssize_t len, const int readUntilChar, const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
+size_t
+Stream::SendGenericRegularUntil(Print* to, const ssize_t len, const int readUntilChar,
+                                const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
 {
     // regular Stream API
     // no other choice than reading byte by byte
 
     // "neverExpires (default, impossible)" is translated to default timeout
-    esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout() : timeoutMs);
+    esp8266::polledTimeout::oneShotFastMs timedOut(
+        timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
+                                                                         : timeoutMs);
     // len==-1 => maxLen=0 <=> until starvation
     const size_t maxLen  = std::max((ssize_t)0, len);
     size_t       written = 0;
@@ -221,13 +225,16 @@ size_t Stream::SendGenericRegularUntil(Print* to, const ssize_t len, const int r
     return written;
 }
 
-size_t Stream::SendGenericRegular(Print* to, const ssize_t len, const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
+size_t Stream::SendGenericRegular(Print* to, const ssize_t len,
+                                  const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
 {
     // regular Stream API
     // use an intermediary buffer
 
     // "neverExpires (default, impossible)" is translated to default timeout
-    esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout() : timeoutMs);
+    esp8266::polledTimeout::oneShotFastMs timedOut(
+        timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
+                                                                         : timeoutMs);
     // len==-1 => maxLen=0 <=> until starvation
     const size_t maxLen  = std::max((ssize_t)0, len);
     size_t       written = 0;

cores/esp8266/StreamString.h

@@ -35,16 +35,9 @@
 class S2Stream: public Stream
 {
 public:
+    S2Stream(String& string, int peekPointer = -1) : string(&string), peekPointer(peekPointer) { }
 
-    S2Stream(String& string, int peekPointer = -1):
+    S2Stream(String* string, int peekPointer = -1) : string(string), peekPointer(peekPointer) { }
-        string(&string), peekPointer(peekPointer)
-    {
-    }
-
-    S2Stream(String* string, int peekPointer = -1):
-        string(string), peekPointer(peekPointer)
-    {
-    }
 
     virtual int available() override
     {
@@ -207,18 +200,15 @@ public:
     }
 
 protected:
-
     String* string;
     int     peekPointer;  // -1:String is consumed / >=0:resettable pointer
 };
 
-
 // StreamString is a S2Stream holding the String
 
 class StreamString: public String, public S2Stream
 {
 protected:
-
     void resetpp()
     {
         if (peekPointer > 0)
@@ -228,7 +218,6 @@ protected:
     }
 
 public:
-
     StreamString(StreamString&& bro) : String(bro), S2Stream(this) { }
     StreamString(const StreamString& bro) : String(bro), S2Stream(this) { }
 
@@ -240,13 +229,27 @@ public:
     StreamString(String&& string) : String(string), S2Stream(this) { }
 
     explicit StreamString(char c) : String(c), S2Stream(this) { }
-    explicit StreamString(unsigned char c, unsigned char base = 10): String(c, base), S2Stream(this) { }
+    explicit StreamString(unsigned char c, unsigned char base = 10) :
+        String(c, base), S2Stream(this)
+    {
+    }
     explicit StreamString(int i, unsigned char base = 10) : String(i, base), S2Stream(this) { }
-    explicit StreamString(unsigned int i, unsigned char base = 10): String(i, base), S2Stream(this) { }
+    explicit StreamString(unsigned int i, unsigned char base = 10) : String(i, base), S2Stream(this)
+    {
+    }
     explicit StreamString(long l, unsigned char base = 10) : String(l, base), S2Stream(this) { }
-    explicit StreamString(unsigned long l, unsigned char base = 10): String(l, base), S2Stream(this) { }
+    explicit StreamString(unsigned long l, unsigned char base = 10) :
-    explicit StreamString(float f, unsigned char decimalPlaces = 2): String(f, decimalPlaces), S2Stream(this) { }
+        String(l, base), S2Stream(this)
-    explicit StreamString(double d, unsigned char decimalPlaces = 2): String(d, decimalPlaces), S2Stream(this) { }
+    {
+    }
+    explicit StreamString(float f, unsigned char decimalPlaces = 2) :
+        String(f, decimalPlaces), S2Stream(this)
+    {
+    }
+    explicit StreamString(double d, unsigned char decimalPlaces = 2) :
+        String(d, decimalPlaces), S2Stream(this)
+    {
+    }
 
     StreamString& operator=(const StreamString& rhs)
     {

cores/esp8266/core_esp8266_si2c.cpp

@@ -24,9 +24,8 @@
 #include "wiring_private.h"
 #include "PolledTimeout.h"
 
-
+extern "C"
-
+{
-extern "C" {
 #include "twi_util.h"
 #include "ets_sys.h"
 };
@@ -57,8 +56,8 @@ static inline __attribute__((always_inline)) bool SCL_READ(const int twi_scl)
     return (GPI & (1 << twi_scl)) != 0;
 }
 
-
+// Implement as a class to reduce code size by allowing access to many global variables with a
-// Implement as a class to reduce code size by allowing access to many global variables with a single base pointer
+// single base pointer
 class Twi
 {
 private:
@@ -69,12 +68,37 @@ private:
     unsigned char twi_addr              = 0;
     uint32_t      twi_clockStretchLimit = 0;
 
-    // These are int-wide, even though they could all fit in a byte, to reduce code size and avoid any potential
+    // These are int-wide, even though they could all fit in a byte, to reduce code size and avoid
-    // issues about RmW on packed bytes.  The int-wide variations of asm instructions are smaller than the equivalent
+    // any potential issues about RmW on packed bytes.  The int-wide variations of asm instructions
-    // byte-wide ones, and since these emums are used everywhere, the difference adds up fast.  There is only a single
+    // are smaller than the equivalent byte-wide ones, and since these emums are used everywhere,
-    // instance of the class, though, so the extra 12 bytes of RAM used here saves a lot more IRAM.
+    // the difference adds up fast.  There is only a single instance of the class, though, so the
-    volatile enum { TWIPM_UNKNOWN = 0, TWIPM_IDLE, TWIPM_ADDRESSED, TWIPM_WAIT} twip_mode = TWIPM_IDLE;
+    // extra 12 bytes of RAM used here saves a lot more IRAM.
-    volatile enum { TWIP_UNKNOWN = 0, TWIP_IDLE, TWIP_START, TWIP_SEND_ACK, TWIP_WAIT_ACK, TWIP_WAIT_STOP, TWIP_SLA_W, TWIP_SLA_R, TWIP_REP_START, TWIP_READ, TWIP_STOP, TWIP_REC_ACK, TWIP_READ_ACK, TWIP_RWAIT_ACK, TWIP_WRITE, TWIP_BUS_ERR } twip_state = TWIP_IDLE;
+    volatile enum {
+        TWIPM_UNKNOWN = 0,
+        TWIPM_IDLE,
+        TWIPM_ADDRESSED,
+        TWIPM_WAIT
+    } twip_mode
+        = TWIPM_IDLE;
+    volatile enum {
+        TWIP_UNKNOWN = 0,
+        TWIP_IDLE,
+        TWIP_START,
+        TWIP_SEND_ACK,
+        TWIP_WAIT_ACK,
+        TWIP_WAIT_STOP,
+        TWIP_SLA_W,
+        TWIP_SLA_R,
+        TWIP_REP_START,
+        TWIP_READ,
+        TWIP_STOP,
+        TWIP_REC_ACK,
+        TWIP_READ_ACK,
+        TWIP_RWAIT_ACK,
+        TWIP_WRITE,
+        TWIP_BUS_ERR
+    } twip_state
+        = TWIP_IDLE;
     volatile int twip_status = TW_NO_INFO;
     volatile int bitCount    = 0;
 
@@ -97,8 +121,17 @@ private:
     void (*twi_onSlaveReceive)(uint8_t*, size_t);
 
     // ETS queue/timer interfaces
-    enum { EVENTTASK_QUEUE_SIZE = 1, EVENTTASK_QUEUE_PRIO = 2 };
+    enum
-    enum { TWI_SIG_RANGE = 0x00000100, TWI_SIG_RX = 0x00000101, TWI_SIG_TX = 0x00000102 };
+    {
+        EVENTTASK_QUEUE_SIZE = 1,
+        EVENTTASK_QUEUE_PRIO = 2
+    };
+    enum
+    {
+        TWI_SIG_RANGE = 0x00000100,
+        TWI_SIG_RX    = 0x00000101,
+        TWI_SIG_TX    = 0x00000102
+    };
     ETSEvent eventTaskQueue[EVENTTASK_QUEUE_SIZE];
     ETSTimer timer;
 
@@ -126,7 +159,8 @@ private:
     {
         esp8266::polledTimeout::oneShotFastUs  timeout(twi_clockStretchLimit);
         esp8266::polledTimeout::periodicFastUs yieldTimeout(5000);
-        while (!timeout && !SCL_READ(twi_scl)) // outer loop is stretch duration up to stretch limit
+        while (!timeout
+               && !SCL_READ(twi_scl))  // outer loop is stretch duration up to stretch limit
         {
             if (yieldTimeout)  // inner loop yields every 5ms
             {
@@ -143,8 +177,10 @@ public:
     void           setClockStretchLimit(uint32_t limit);
     void           init(unsigned char sda, unsigned char scl);
     void           setAddress(uint8_t address);
-    unsigned char writeTo(unsigned char address, unsigned char * buf, unsigned int len, unsigned char sendStop);
+    unsigned char  writeTo(unsigned char address, unsigned char* buf, unsigned int len,
-    unsigned char readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
+                           unsigned char sendStop);
+    unsigned char  readFrom(unsigned char address, unsigned char* buf, unsigned int len,
+                            unsigned char sendStop);
     uint8_t        status();
     uint8_t        transmit(const uint8_t* data, uint8_t length);
     void           attachSlaveRxEvent(void (*function)(uint8_t*, size_t));
@@ -176,7 +212,8 @@ void Twi::setClock(unsigned int freq)
         freq = 400000;
     }
     twi_dcount = (500000000 / freq);  // half-cycle period in ns
-    twi_dcount = (1000 * (twi_dcount - 1120)) / 62500; // (half cycle - overhead) / busywait loop time
+    twi_dcount
+        = (1000 * (twi_dcount - 1120)) / 62500;  // (half cycle - overhead) / busywait loop time
 
 #else
 
@@ -185,7 +222,8 @@ void Twi::setClock(unsigned int freq)
         freq = 800000;
     }
     twi_dcount = (500000000 / freq);  // half-cycle period in ns
-    twi_dcount = (1000 * (twi_dcount - 560)) / 31250; // (half cycle - overhead) / busywait loop time
+    twi_dcount
+        = (1000 * (twi_dcount - 560)) / 31250;  // (half cycle - overhead) / busywait loop time
 
 #endif
 }
@@ -195,8 +233,6 @@ void Twi::setClockStretchLimit(uint32_t limit)
     twi_clockStretchLimit = limit;
 }
 
-
-
 void Twi::init(unsigned char sda, unsigned char scl)
 {
     // set timer function
@@ -234,7 +270,8 @@ void IRAM_ATTR Twi::busywait(unsigned int v)
     unsigned int i;
     for (i = 0; i < v; i++)  // loop time is 5 machine cycles: 31.25ns @ 160MHz, 62.5ns @ 80MHz
     {
-        __asm__ __volatile__("nop"); // minimum element to keep GCC from optimizing this function out.
+        __asm__ __volatile__(
+            "nop");  // minimum element to keep GCC from optimizing this function out.
     }
 }
 
@@ -250,7 +287,8 @@ bool Twi::write_start(void)
     // A high-to-low transition on the SDA line while the SCL is high defines a START condition.
     SDA_LOW(twi_sda);
     busywait(twi_dcount);
-    // An additional delay between the SCL line high-to-low transition and setting up the SDA line to prevent a STOP condition execute.
+    // An additional delay between the SCL line high-to-low transition and setting up the SDA line
+    // to prevent a STOP condition execute.
     SCL_LOW(twi_scl);
     busywait(twi_dcount);
     return true;
@@ -323,7 +361,8 @@ unsigned char Twi::read_byte(bool nack)
     return byte;
 }
 
-unsigned char Twi::writeTo(unsigned char address, unsigned char * buf, unsigned int len, unsigned char sendStop)
+unsigned char Twi::writeTo(unsigned char address, unsigned char* buf, unsigned int len,
+                           unsigned char sendStop)
 {
     unsigned int i;
     if (!write_start())
@@ -368,7 +407,8 @@ unsigned char Twi::writeTo(unsigned char address, unsigned char * buf, unsigned
     return 0;
 }
 
-unsigned char Twi::readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop)
+unsigned char Twi::readFrom(unsigned char address, unsigned char* buf, unsigned int len,
+                            unsigned char sendStop)
 {
     unsigned int i;
     if (!write_start())
@@ -420,21 +460,25 @@ uint8_t Twi::status()
     WAIT_CLOCK_STRETCH();  // wait for a slow slave to finish
     if (!SCL_READ(twi_scl))
     {
-        return I2C_SCL_HELD_LOW;  // SCL held low by another device, no procedure available to recover
+        return I2C_SCL_HELD_LOW;  // SCL held low by another device, no procedure available to
+                                  // recover
     }
 
     int clockCount = 20;
-    while (!SDA_READ(twi_sda) && clockCount-- > 0)   // if SDA low, read the bits slaves have to sent to a max
+    while (!SDA_READ(twi_sda)
+           && clockCount-- > 0)  // if SDA low, read the bits slaves have to sent to a max
     {
         read_bit();
         if (!SCL_READ(twi_scl))
         {
-            return I2C_SCL_HELD_LOW_AFTER_READ; // I2C bus error. SCL held low beyond slave clock stretch time
+            return I2C_SCL_HELD_LOW_AFTER_READ;  // I2C bus error. SCL held low beyond slave clock
+                                                 // stretch time
         }
     }
     if (!SDA_READ(twi_sda))
     {
-        return I2C_SDA_HELD_LOW;  // I2C bus error. SDA line held low by slave/another_master after n bits.
+        return I2C_SDA_HELD_LOW;  // I2C bus error. SDA line held low by slave/another_master after
+                                  // n bits.
     }
 
     return I2C_OK;
@@ -476,8 +520,9 @@ void Twi::attachSlaveTxEvent(void (*function)(void))
     twi_onSlaveTransmit = function;
 }
 
-// DO NOT INLINE, inlining reply() in combination with compiler optimizations causes function breakup into
+// DO NOT INLINE, inlining reply() in combination with compiler optimizations causes function
-// parts and the IRAM_ATTR isn't propagated correctly to all parts, which of course causes crashes.
+// breakup into parts and the IRAM_ATTR isn't propagated correctly to all parts, which of course
+// causes crashes.
 // TODO: test with gcc 9.x and if it still fails, disable optimization with -fdisable-ipa-fnsplit
 void IRAM_ATTR Twi::reply(uint8_t ack)
 {
@@ -496,7 +541,6 @@ void IRAM_ATTR Twi::reply(uint8_t ack)
     }
 }
 
-
 void IRAM_ATTR Twi::releaseBus(void)
 {
     // release bus
@@ -509,7 +553,6 @@ void IRAM_ATTR Twi::releaseBus(void)
     twi_state = TWI_READY;
 }
 
-
 void IRAM_ATTR Twi::onTwipEvent(uint8_t status)
 {
     twip_status = status;
@@ -628,7 +671,6 @@ void IRAM_ATTR Twi::onTimer(void *unused)
 
 void Twi::eventTask(ETSEvent* e)
 {
-
     if (e == NULL)
     {
         return;
@@ -891,7 +933,9 @@ void IRAM_ATTR Twi::onSdaChange(void)
                 ets_timer_arm_new(&twi.timer, twi.twi_timeout_ms, false, true);  // Once, ms
             }
         }
-        else IFSTATE(S2M(TWIP_START) | S2M(TWIP_REP_START) | S2M(TWIP_SEND_ACK) | S2M(TWIP_WAIT_ACK) | S2M(TWIP_SLA_R) | S2M(TWIP_REC_ACK) | S2M(TWIP_READ_ACK) | S2M(TWIP_RWAIT_ACK) | S2M(TWIP_WRITE))
+        else IFSTATE(S2M(TWIP_START) | S2M(TWIP_REP_START) | S2M(TWIP_SEND_ACK) | S2M(TWIP_WAIT_ACK)
+                     | S2M(TWIP_SLA_R) | S2M(TWIP_REC_ACK) | S2M(TWIP_READ_ACK)
+                     | S2M(TWIP_RWAIT_ACK) | S2M(TWIP_WRITE))
         {
             // START or STOP
             SDA_HIGH(twi.twi_sda);  // Should not be necessary
@@ -961,8 +1005,8 @@ void IRAM_ATTR Twi::onSdaChange(void)
 }
 
 // C wrappers for the object, since API is exposed only as C
-extern "C" {
+extern "C"
-
+{
     void twi_init(unsigned char sda, unsigned char scl)
     {
         return twi.init(sda, scl);
@@ -983,12 +1027,14 @@ extern "C" {
         twi.setClockStretchLimit(limit);
     }
 
-    uint8_t twi_writeTo(unsigned char address, unsigned char * buf, unsigned int len, unsigned char sendStop)
+    uint8_t twi_writeTo(unsigned char address, unsigned char* buf, unsigned int len,
+                        unsigned char sendStop)
     {
         return twi.writeTo(address, buf, len, sendStop);
     }
 
-    uint8_t twi_readFrom(unsigned char address, unsigned char * buf, unsigned int len, unsigned char sendStop)
+    uint8_t twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len,
+                         unsigned char sendStop)
     {
         return twi.readFrom(address, buf, len, sendStop);
     }
@@ -1027,5 +1073,4 @@ extern "C" {
     {
         twi.enableSlave();
     }
-
 };

cores/esp8266/debug.h

@@ -9,7 +9,11 @@
 #endif
 
 #ifndef DEBUGV
-#define DEBUGV(...) do { (void)0; } while (0)
+#define DEBUGV(...)                                                                                \
+    do                                                                                             \
+    {                                                                                              \
+        (void)0;                                                                                   \
+    } while (0)
 #endif
 
 #ifdef __cplusplus
@@ -19,7 +23,8 @@ void hexdump(const void *mem, uint32_t len, uint8_t cols);
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
     void __unhandled_exception(const char* str) __attribute__((noreturn));
@@ -29,20 +34,25 @@ void __panic_func(const char* file, int line, const char* func) __attribute__((n
 #ifdef DEBUG_ESP_CORE
     extern void __iamslow(const char* what);
 #define IAMSLOW()                                                                                  \
-    do { \
+    do                                                                                             \
+    {                                                                                              \
         static bool once = false;                                                                  \
-        if (!once) { \
+        if (!once)                                                                                 \
+        {                                                                                          \
             once = true;                                                                           \
             __iamslow((PGM_P)FPSTR(__FUNCTION__));                                                 \
         }                                                                                          \
     } while (0)
 #else
-#define IAMSLOW() do { (void)0; } while (0)
+#define IAMSLOW()                                                                                  \
+    do                                                                                             \
+    {                                                                                              \
+        (void)0;                                                                                   \
+    } while (0)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-
 #endif  // ARD_DEBUG_H

libraries/ArduinoOTA/examples/OTALeds/OTALeds.ino

@@ -67,7 +67,6 @@ void setup() {
   /* setup the OTA server */
   ArduinoOTA.begin();
   Serial.println("Ready");
-
 }
 
 void loop() {

libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino

@@ -130,9 +130,7 @@ void loop() {
         WiFi.disconnect();
       }
     }
-    if (s == WL_CONNECTED) {
+    if (s == WL_CONNECTED) { MDNS.update(); }
-      MDNS.update();
-    }
   }
   // Do work:
   // DNS

libraries/DNSServer/examples/CaptivePortalAdvanced/handleHttp.ino

@@ -8,8 +8,7 @@ void handleRoot() {
   server.sendHeader("Expires", "-1");
 
   String Page;
-  Page += F(
+  Page += F("<!DOCTYPE html><html lang='en'><head>"
-            "<!DOCTYPE html><html lang='en'><head>"
             "<meta name='viewport' content='width=device-width'>"
             "<title>CaptivePortal</title></head><body>"
             "<h1>HELLO WORLD!!</h1>");
@@ -18,8 +17,7 @@ void handleRoot() {
   } else {
     Page += String(F("<p>You are connected through the wifi network: ")) + ssid + F("</p>");
   }
-  Page += F(
+  Page += F("<p>You may want to <a href='/wifi'>config the wifi connection</a>.</p>"
-            "<p>You may want to <a href='/wifi'>config the wifi connection</a>.</p>"
             "</body></html>");
 
   server.send(200, "text/html", Page);
@@ -44,8 +42,7 @@ void handleWifi() {
   server.sendHeader("Expires", "-1");
 
   String Page;
-  Page += F(
+  Page += F("<!DOCTYPE html><html lang='en'><head>"
-            "<!DOCTYPE html><html lang='en'><head>"
             "<meta name='viewport' content='width=device-width'>"
             "<title>CaptivePortal</title></head><body>"
             "<h1>Wifi config</h1>");
@@ -54,25 +51,19 @@ void handleWifi() {
   } else {
     Page += String(F("<p>You are connected through the wifi network: ")) + ssid + F("</p>");
   }
-  Page +=
+  Page += String(F("\r\n<br />"
-    String(F(
-             "\r\n<br />"
                    "<table><tr><th align='left'>SoftAP config</th></tr>"
-             "<tr><td>SSID ")) +
+                   "<tr><td>SSID "))
-    String(softAP_ssid) +
+          + String(softAP_ssid) + F("</td></tr>"
-    F("</td></tr>"
+                                    "<tr><td>IP ")
-      "<tr><td>IP ") +
+          + toStringIp(WiFi.softAPIP()) + F("</td></tr>"
-    toStringIp(WiFi.softAPIP()) +
-    F("</td></tr>"
                                             "</table>"
                                             "\r\n<br />"
                                             "<table><tr><th align='left'>WLAN config</th></tr>"
-      "<tr><td>SSID ") +
+                                            "<tr><td>SSID ")
-    String(ssid) +
+          + String(ssid) + F("</td></tr>"
-    F("</td></tr>"
+                             "<tr><td>IP ")
-      "<tr><td>IP ") +
+          + toStringIp(WiFi.localIP()) + F("</td></tr>"
-    toStringIp(WiFi.localIP()) +
-    F("</td></tr>"
                                            "</table>"
                                            "\r\n<br />"
                                            "<table><tr><th align='left'>WLAN list (refresh if any missing)</th></tr>");
@@ -80,14 +71,11 @@ void handleWifi() {
   int n = WiFi.scanNetworks();
   Serial.println("scan done");
   if (n > 0) {
-    for (int i = 0; i < n; i++) {
+    for (int i = 0; i < n; i++) { Page += String(F("\r\n<tr><td>SSID ")) + WiFi.SSID(i) + ((WiFi.encryptionType(i) == ENC_TYPE_NONE) ? F(" ") : F(" *")) + F(" (") + WiFi.RSSI(i) + F(")</td></tr>"); }
-      Page += String(F("\r\n<tr><td>SSID ")) + WiFi.SSID(i) + ((WiFi.encryptionType(i) == ENC_TYPE_NONE) ? F(" ") : F(" *")) + F(" (") + WiFi.RSSI(i) + F(")</td></tr>");
-    }
   } else {
     Page += F("<tr><td>No WLAN found</td></tr>");
   }
-  Page += F(
+  Page += F("</table>"
-            "</table>"
             "\r\n<br /><form method='POST' action='wifisave'><h4>Connect to network:</h4>"
             "<input type='text' placeholder='network' name='n'/>"
             "<br /><input type='password' placeholder='password' name='p'/>"
@@ -126,9 +114,7 @@ void handleNotFound() {
   message += server.args();
   message += F("\n");
 
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += String(F(" ")) + server.argName(i) + F(": ") + server.arg(i) + F("\n"); }
-    message += String(F(" ")) + server.argName(i) + F(": ") + server.arg(i) + F("\n");
-  }
   server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
   server.sendHeader("Pragma", "no-cache");
   server.sendHeader("Expires", "-1");

libraries/DNSServer/examples/CaptivePortalAdvanced/tools.ino

@@ -2,9 +2,7 @@
 boolean isIp(String str) {
   for (size_t i = 0; i < str.length(); i++) {
     int c = str.charAt(i);
-    if (c != '.' && (c < '0' || c > '9')) {
+    if (c != '.' && (c < '0' || c > '9')) { return false; }
-      return false;
-    }
   }
   return true;
 }
@@ -12,10 +10,7 @@ boolean isIp(String str) {
 /** IP to String? */
 String toStringIp(IPAddress ip) {
   String res = "";
-  for (int i = 0; i < 3; i++) {
+  for (int i = 0; i < 3; i++) { res += String((ip >> (8 * i)) & 0xFF) + "."; }
-    res += String((ip >> (8 * i)) & 0xFF) + ".";
-  }
   res += String(((ip >> 8 * 3)) & 0xFF);
   return res;
 }
-

libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino

@@ -11,9 +11,7 @@
 void setup() {
   EEPROM.begin(512);
   // write a 0 to all 512 bytes of the EEPROM
-  for (int i = 0; i < 512; i++) {
+  for (int i = 0; i < 512; i++) { EEPROM.write(i, 0); }
-    EEPROM.write(i, 0);
-  }
 
   // turn the LED on when we're done
   pinMode(13, OUTPUT);
@@ -21,5 +19,4 @@ void setup() {
   EEPROM.end();
 }
 
-void loop() {
+void loop() {}
-}

libraries/EEPROM/examples/eeprom_read/eeprom_read.ino

@@ -32,9 +32,7 @@ void loop() {
 
   // there are only 512 bytes of EEPROM, from 0 to 511, so if we're
   // on address 512, wrap around to address 0
-  if (address == 512) {
+  if (address == 512) { address = 0; }
-    address = 0;
-  }
 
   delay(500);
 }

libraries/ESP8266AVRISP/examples/Arduino_Wifi_AVRISP/Arduino_Wifi_AVRISP.ino

@@ -51,17 +51,20 @@ void loop() {
   AVRISPState_t new_state = avrprog.update();
   if (last_state != new_state) {
     switch (new_state) {
-      case AVRISP_STATE_IDLE: {
+      case AVRISP_STATE_IDLE:
+        {
           Serial.printf("[AVRISP] now idle\r\n");
           // Use the SPI bus for other purposes
           break;
         }
-      case AVRISP_STATE_PENDING: {
+      case AVRISP_STATE_PENDING:
+        {
           Serial.printf("[AVRISP] connection pending\r\n");
           // Clean up your other purposes and prepare for programming mode
           break;
         }
-      case AVRISP_STATE_ACTIVE: {
+      case AVRISP_STATE_ACTIVE:
+        {
           Serial.printf("[AVRISP] programming mode\r\n");
           // Stand by for completion
           break;
@@ -70,11 +73,7 @@ void loop() {
     last_state = new_state;
   }
   // Serve the client
-  if (last_state != AVRISP_STATE_IDLE) {
+  if (last_state != AVRISP_STATE_IDLE) { avrprog.serve(); }
-    avrprog.serve();
-  }
 
-  if (WiFi.status() == WL_CONNECTED) {
+  if (WiFi.status() == WL_CONNECTED) { MDNS.update(); }
-    MDNS.update();
-  }
 }

libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino

@@ -33,7 +33,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP("SSID", "PASSWORD");
-
 }
 
 void loop() {

libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino

@@ -33,7 +33,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP("SSID", "PASSWORD");
-
 }
 
 void loop() {

libraries/ESP8266HTTPClient/examples/DigestAuthorization/DigestAuthorization.ino

@@ -27,22 +27,17 @@ const char *uri = "/digest-auth/auth/admin/admin/MD5";
 
 String exractParam(String& authReq, const String& param, const char delimit) {
   int _begin = authReq.indexOf(param);
-  if (_begin == -1) {
+  if (_begin == -1) { return ""; }
-    return "";
-  }
   return authReq.substring(_begin + param.length(), authReq.indexOf(delimit, _begin + param.length()));
 }
 
 String getCNonce(const int len) {
-  static const char alphanum[] =
+  static const char alphanum[] = "0123456789"
-    "0123456789"
                                  "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                  "abcdefghijklmnopqrstuvwxyz";
   String s = "";
 
-  for (int i = 0; i < len; ++i) {
+  for (int i = 0; i < len; ++i) { s += alphanum[rand() % (sizeof(alphanum) - 1)]; }
-    s += alphanum[rand() % (sizeof(alphanum) - 1)];
-  }
 
   return s;
 }
@@ -73,8 +68,7 @@ String getDigestAuth(String& authReq, const String& username, const String& pass
   md5.calculate();
   String response = md5.toString();
 
-  String authorization = "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\"" + nonce +
+  String authorization = "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\"" + nonce + "\", uri=\"" + uri + "\", algorithm=\"MD5\", qop=auth, nc=" + String(nc) + ", cnonce=\"" + cNonce + "\", response=\"" + response + "\"";
-                         "\", uri=\"" + uri + "\", algorithm=\"MD5\", qop=auth, nc=" + String(nc) + ", cnonce=\"" + cNonce + "\", response=\"" + response + "\"";
   Serial.println(authorization);
 
   return authorization;

libraries/ESP8266HTTPClient/examples/PostHttpClient/PostHttpClient.ino

@@ -40,7 +40,6 @@ void setup() {
   Serial.println("");
   Serial.print("Connected! IP address: ");
   Serial.println(WiFi.localIP());
-
 }
 
 void loop() {

libraries/ESP8266HTTPClient/examples/ReuseConnectionV2/ReuseConnectionV2.ino

@@ -60,9 +60,7 @@ void loop() {
       Serial.printf("[HTTP] GET... code: %d\n", httpCode);
 
       // file found at server
-      if (httpCode == HTTP_CODE_OK) {
+      if (httpCode == HTTP_CODE_OK) { http.writeToStream(&Serial); }
-        http.writeToStream(&Serial);
-      }
     } else {
       Serial.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
       // Something went wrong with the connection, try to reconnect

libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino

@@ -31,7 +31,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP("SSID", "PASSWORD");
-
 }
 
 void loop() {
@@ -77,16 +76,12 @@ void loop() {
           // read up to 128 byte
           int c = stream->readBytes(buff, std::min((size_t)len, sizeof(buff)));
           Serial.printf("readBytes: %d\n", c);
-          if (!c) {
+          if (!c) { Serial.println("read timeout"); }
-            Serial.println("read timeout");
-          }
 
           // write it to Serial
           Serial.write(buff, c);
 
-          if (len > 0) {
+          if (len > 0) { len -= c; }
-            len -= c;
-          }
         }
 #endif
 

libraries/ESP8266HTTPClient/examples/StreamHttpsClient/StreamHttpsClient.ino

@@ -31,7 +31,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP("SSID", "PASSWORD");
-
 }
 
 void loop() {
@@ -43,9 +42,7 @@ void loop() {
     bool mfln = client->probeMaxFragmentLength("tls.mbed.org", 443, 1024);
     Serial.printf("\nConnecting to https://tls.mbed.org\n");
     Serial.printf("Maximum fragment Length negotiation supported: %s\n", mfln ? "yes" : "no");
-    if (mfln) {
+    if (mfln) { client->setBufferSizes(1024, 1024); }
-      client->setBufferSizes(1024, 1024);
-    }
 
     Serial.print("[HTTPS] begin...\n");
 
@@ -86,16 +83,13 @@ void loop() {
               // write it to Serial
               Serial.write(buff, c);
 
-              if (len > 0) {
+              if (len > 0) { len -= c; }
-                len -= c;
-              }
             }
             delay(1);
           }
 
           Serial.println();
           Serial.print("[HTTPS] connection closed or file end.\n");
-
         }
       } else {
         Serial.printf("[HTTPS] GET... failed, error: %s\n", https.errorToString(httpCode).c_str());

libraries/ESP8266HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino

@@ -88,8 +88,7 @@ gz5JWYhbD6c38khSzJb0pNXCo3EuYAVa36kDM96k1BtWuhRS10Q1VXk=
 )EOF";
 
 
-void setup()
+void setup() {
-{
 
   Serial.begin(115200);
   Serial.println();
@@ -111,13 +110,13 @@ void setup()
   httpServer.begin();
 
   MDNS.addService("https", "tcp", 443);
-  Serial.printf("BearSSLUpdateServer ready!\nOpen https://%s.local%s in "\
+  Serial.printf("BearSSLUpdateServer ready!\nOpen https://%s.local%s in "
-                "your browser and login with username '%s' and password "\
+                "your browser and login with username '%s' and password "
-                "'%s'\n", host, update_path, update_username, update_password);
+                "'%s'\n",
+                host, update_path, update_username, update_password);
 }
 
-void loop()
+void loop() {
-{
   httpServer.handleClient();
   MDNS.update();
 }

libraries/ESP8266SSDP/examples/SSDP/SSDP.ino

@@ -46,9 +46,7 @@ void setup() {
     Serial.printf("Ready!\n");
   } else {
     Serial.printf("WiFi Failed\n");
-    while (1) {
+    while (1) { delay(100); }
-      delay(100);
-    }
   }
 }
 

libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino

@@ -69,8 +69,7 @@ void handleRoot() {
   </body>\
 </html>",
 
-           hr, min % 60, sec % 60
+           hr, min % 60, sec % 60);
-          );
   server.send(200, "text/html", temp);
   digitalWrite(led, 0);
 }
@@ -86,9 +85,7 @@ void handleNotFound() {
   message += server.args();
   message += "\n";
 
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
 
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
@@ -133,9 +130,7 @@ void setup(void) {
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   server.on("/", handleRoot);
   server.on("/test.svg", drawGraph);
@@ -151,4 +146,3 @@ void loop(void) {
   server.handleClient();
   MDNS.update();
 }
-

libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino

@@ -122,15 +122,9 @@ void replyServerError(String msg) {
 */
 String checkForUnsupportedPath(String filename) {
   String error = String();
-  if (!filename.startsWith("/")) {
+  if (!filename.startsWith("/")) { error += F("!NO_LEADING_SLASH! "); }
-    error += F("!NO_LEADING_SLASH! ");
+  if (filename.indexOf("//") != -1) { error += F("!DOUBLE_SLASH! "); }
-  }
+  if (filename.endsWith("/")) { error += F("!TRAILING_SLASH! "); }
-  if (filename.indexOf("//") != -1) {
-    error += F("!DOUBLE_SLASH! ");
-  }
-  if (filename.endsWith("/")) {
-    error += F("!TRAILING_SLASH! ");
-  }
   return error;
 }
 #endif
@@ -174,18 +168,12 @@ void handleStatus() {
    Also demonstrates the use of chunked responses.
 */
 void handleFileList() {
-  if (!fsOK) {
+  if (!fsOK) { return replyServerError(FPSTR(FS_INIT_ERROR)); }
-    return replyServerError(FPSTR(FS_INIT_ERROR));
-  }
 
-  if (!server.hasArg("dir")) {
+  if (!server.hasArg("dir")) { return replyBadRequest(F("DIR ARG MISSING")); }
-    return replyBadRequest(F("DIR ARG MISSING"));
-  }
 
   String path = server.arg("dir");
-  if (path != "/" && !fileSystem->exists(path)) {
+  if (path != "/" && !fileSystem->exists(path)) { return replyBadRequest("BAD PATH"); }
-    return replyBadRequest("BAD PATH");
-  }
 
   DBG_OUTPUT_PORT.println(String("handleFileList: ") + path);
   Dir dir = fileSystem->openDir(path);
@@ -253,9 +241,7 @@ bool handleFileRead(String path) {
     return true;
   }
 
-  if (path.endsWith("/")) {
+  if (path.endsWith("/")) { path += "index.htm"; }
-    path += "index.htm";
-  }
 
   String contentType;
   if (server.hasArg("download")) {
@@ -270,9 +256,7 @@ bool handleFileRead(String path) {
   }
   if (fileSystem->exists(path)) {
     File file = fileSystem->open(path, "r");
-    if (server.streamFile(file, contentType) != file.size()) {
+    if (server.streamFile(file, contentType) != file.size()) { DBG_OUTPUT_PORT.println("Sent less data than expected!"); }
-      DBG_OUTPUT_PORT.println("Sent less data than expected!");
-    }
     file.close();
     return true;
   }
@@ -309,27 +293,17 @@ String lastExistingParent(String path) {
    Move folder    | parent of source folder, or remaining ancestor
 */
 void handleFileCreate() {
-  if (!fsOK) {
+  if (!fsOK) { return replyServerError(FPSTR(FS_INIT_ERROR)); }
-    return replyServerError(FPSTR(FS_INIT_ERROR));
-  }
 
   String path = server.arg("path");
-  if (path.isEmpty()) {
+  if (path.isEmpty()) { return replyBadRequest(F("PATH ARG MISSING")); }
-    return replyBadRequest(F("PATH ARG MISSING"));
-  }
 
 #ifdef USE_SPIFFS
-  if (checkForUnsupportedPath(path).length() > 0) {
+  if (checkForUnsupportedPath(path).length() > 0) { return replyServerError(F("INVALID FILENAME")); }
-    return replyServerError(F("INVALID FILENAME"));
-  }
 #endif
 
-  if (path == "/") {
+  if (path == "/") { return replyBadRequest("BAD PATH"); }
-    return replyBadRequest("BAD PATH");
+  if (fileSystem->exists(path)) { return replyBadRequest(F("PATH FILE EXISTS")); }
-  }
-  if (fileSystem->exists(path)) {
-    return replyBadRequest(F("PATH FILE EXISTS"));
-  }
 
   String src = server.arg("src");
   if (src.isEmpty()) {
@@ -338,9 +312,7 @@ void handleFileCreate() {
     if (path.endsWith("/")) {
       // Create a folder
       path.remove(path.length() - 1);
-      if (!fileSystem->mkdir(path)) {
+      if (!fileSystem->mkdir(path)) { return replyServerError(F("MKDIR FAILED")); }
-        return replyServerError(F("MKDIR FAILED"));
-      }
     } else {
       // Create a file
       File file = fileSystem->open(path, "w");
@@ -351,30 +323,18 @@ void handleFileCreate() {
         return replyServerError(F("CREATE FAILED"));
       }
     }
-    if (path.lastIndexOf('/') > -1) {
+    if (path.lastIndexOf('/') > -1) { path = path.substring(0, path.lastIndexOf('/')); }
-      path = path.substring(0, path.lastIndexOf('/'));
-    }
     replyOKWithMsg(path);
   } else {
     // Source specified: rename
-    if (src == "/") {
+    if (src == "/") { return replyBadRequest("BAD SRC"); }
-      return replyBadRequest("BAD SRC");
+    if (!fileSystem->exists(src)) { return replyBadRequest(F("SRC FILE NOT FOUND")); }
-    }
-    if (!fileSystem->exists(src)) {
-      return replyBadRequest(F("SRC FILE NOT FOUND"));
-    }
 
     DBG_OUTPUT_PORT.println(String("handleFileCreate: ") + path + " from " + src);
 
-    if (path.endsWith("/")) {
+    if (path.endsWith("/")) { path.remove(path.length() - 1); }
-      path.remove(path.length() - 1);
+    if (src.endsWith("/")) { src.remove(src.length() - 1); }
-    }
+    if (!fileSystem->rename(src, path)) { return replyServerError(F("RENAME FAILED")); }
-    if (src.endsWith("/")) {
-      src.remove(src.length() - 1);
-    }
-    if (!fileSystem->rename(src, path)) {
-      return replyServerError(F("RENAME FAILED"));
-    }
     replyOKWithMsg(lastExistingParent(src));
   }
 }
@@ -403,9 +363,7 @@ void deleteRecursive(String path) {
   // Otherwise delete its contents first
   Dir dir = fileSystem->openDir(path);
 
-  while (dir.next()) {
+  while (dir.next()) { deleteRecursive(path + '/' + dir.fileName()); }
-    deleteRecursive(path + '/' + dir.fileName());
-  }
 
   // Then delete the folder itself
   fileSystem->rmdir(path);
@@ -420,19 +378,13 @@ void deleteRecursive(String path) {
    Delete folder  | parent of deleted folder, or remaining ancestor
 */
 void handleFileDelete() {
-  if (!fsOK) {
+  if (!fsOK) { return replyServerError(FPSTR(FS_INIT_ERROR)); }
-    return replyServerError(FPSTR(FS_INIT_ERROR));
-  }
 
   String path = server.arg(0);
-  if (path.isEmpty() || path == "/") {
+  if (path.isEmpty() || path == "/") { return replyBadRequest("BAD PATH"); }
-    return replyBadRequest("BAD PATH");
-  }
 
   DBG_OUTPUT_PORT.println(String("handleFileDelete: ") + path);
-  if (!fileSystem->exists(path)) {
+  if (!fileSystem->exists(path)) { return replyNotFound(FPSTR(FILE_NOT_FOUND)); }
-    return replyNotFound(FPSTR(FILE_NOT_FOUND));
-  }
   deleteRecursive(path);
 
   replyOKWithMsg(lastExistingParent(path));
@@ -442,37 +394,25 @@ void handleFileDelete() {
    Handle a file upload request
 */
 void handleFileUpload() {
-  if (!fsOK) {
+  if (!fsOK) { return replyServerError(FPSTR(FS_INIT_ERROR)); }
-    return replyServerError(FPSTR(FS_INIT_ERROR));
+  if (server.uri() != "/edit") { return; }
-  }
-  if (server.uri() != "/edit") {
-    return;
-  }
   HTTPUpload& upload = server.upload();
   if (upload.status == UPLOAD_FILE_START) {
     String filename = upload.filename;
     // Make sure paths always start with "/"
-    if (!filename.startsWith("/")) {
+    if (!filename.startsWith("/")) { filename = "/" + filename; }
-      filename = "/" + filename;
-    }
     DBG_OUTPUT_PORT.println(String("handleFileUpload Name: ") + filename);
     uploadFile = fileSystem->open(filename, "w");
-    if (!uploadFile) {
+    if (!uploadFile) { return replyServerError(F("CREATE FAILED")); }
-      return replyServerError(F("CREATE FAILED"));
-    }
     DBG_OUTPUT_PORT.println(String("Upload: START, filename: ") + filename);
   } else if (upload.status == UPLOAD_FILE_WRITE) {
     if (uploadFile) {
       size_t bytesWritten = uploadFile.write(upload.buf, upload.currentSize);
-      if (bytesWritten != upload.currentSize) {
+      if (bytesWritten != upload.currentSize) { return replyServerError(F("WRITE FAILED")); }
-        return replyServerError(F("WRITE FAILED"));
-      }
     }
     DBG_OUTPUT_PORT.println(String("Upload: WRITE, Bytes: ") + upload.currentSize);
   } else if (upload.status == UPLOAD_FILE_END) {
-    if (uploadFile) {
+    if (uploadFile) { uploadFile.close(); }
-      uploadFile.close();
-    }
     DBG_OUTPUT_PORT.println(String("Upload: END, Size: ") + upload.totalSize);
   }
 }
@@ -484,15 +424,11 @@ void handleFileUpload() {
    and if it fails, return a 404 page with debug information
 */
 void handleNotFound() {
-  if (!fsOK) {
+  if (!fsOK) { return replyServerError(FPSTR(FS_INIT_ERROR)); }
-    return replyServerError(FPSTR(FS_INIT_ERROR));
-  }
 
   String uri = ESP8266WebServer::urlDecode(server.uri());  // required to read paths with blanks
 
-  if (handleFileRead(uri)) {
+  if (handleFileRead(uri)) { return; }
-    return;
-  }
 
   // Dump debug data
   String message;
@@ -526,9 +462,7 @@ void handleNotFound() {
    Otherwise, fails with a 404 page with debug information
 */
 void handleGetEdit() {
-  if (handleFileRead(F("/edit/index.htm"))) {
+  if (handleFileRead(F("/edit/index.htm"))) { return; }
-    return;
-  }
 
 #ifdef INCLUDE_FALLBACK_INDEX_HTM
   server.sendHeader(F("Content-Encoding"), "gzip");
@@ -536,7 +470,6 @@ void handleGetEdit() {
 #else
   replyNotFound(FPSTR(FILE_NOT_FOUND));
 #endif
-
 }
 
 void setup(void) {
@@ -562,9 +495,7 @@ void setup(void) {
     String error = checkForUnsupportedPath(dir.fileName());
     String fileInfo = dir.fileName() + (dir.isDirectory() ? " [DIR]" : String(" (") + dir.fileSize() + "b)");
     DBG_OUTPUT_PORT.println(error + fileInfo);
-    if (error.length() > 0) {
+    if (error.length() > 0) { unsupportedFiles += error + fileInfo + '\n'; }
-      unsupportedFiles += error + fileInfo + '\n';
-    }
   }
   DBG_OUTPUT_PORT.println();
 

libraries/ESP8266WebServer/examples/Graph/Graph.ino

@@ -110,9 +110,7 @@ void replyServerError(String msg) {
 bool handleFileRead(String path) {
   DBG_OUTPUT_PORT.println(String("handleFileRead: ") + path);
 
-  if (path.endsWith("/")) {
+  if (path.endsWith("/")) { path += "index.htm"; }
-    path += "index.htm";
-  }
 
   String contentType = mime::getContentType(path);
 
@@ -122,9 +120,7 @@ bool handleFileRead(String path) {
   }
   if (fileSystem->exists(path)) {
     File file = fileSystem->open(path, "r");
-    if (server.streamFile(file, contentType) != file.size()) {
+    if (server.streamFile(file, contentType) != file.size()) { DBG_OUTPUT_PORT.println("Sent less data than expected!"); }
-      DBG_OUTPUT_PORT.println("Sent less data than expected!");
-    }
     file.close();
     return true;
   }
@@ -141,9 +137,7 @@ bool handleFileRead(String path) {
 void handleNotFound() {
   String uri = ESP8266WebServer::urlDecode(server.uri());  // required to read paths with blanks
 
-  if (handleFileRead(uri)) {
+  if (handleFileRead(uri)) { return; }
-    return;
-  }
 
   // Dump debug data
   String message;
@@ -249,16 +243,13 @@ void setup(void) {
   DBG_OUTPUT_PORT.println(" 0 (OFF):    outputs are off and hidden from chart");
   DBG_OUTPUT_PORT.println(" 1 (AUTO):   outputs are rotated automatically every second");
   DBG_OUTPUT_PORT.println(" 2 (MANUAL): outputs can be toggled from the web page");
-
 }
 
 // Return default GPIO mask, that is all I/Os except SD card ones
 unsigned int defaultMask() {
   unsigned int mask = 0b11111111111111111;
   for (auto pin = 0; pin <= 16; pin++) {
-    if (isFlashInterfacePin(pin)) {
+    if (isFlashInterfacePin(pin)) { mask &= ~(1 << pin); }
-      mask &= ~(1 << pin);
-    }
   }
   return mask;
 }
@@ -278,17 +269,13 @@ void loop(void) {
   }
 
   // see if one second has passed since last change, otherwise stop here
-  if (!timeToChange) {
+  if (!timeToChange) { return; }
-    return;
-  }
 
   // see if a mode change was requested
   if (modeChangeRequested) {
     // increment mode (reset after 2)
     rgbMode++;
-    if (rgbMode > 2) {
+    if (rgbMode > 2) { rgbMode = 0; }
-      rgbMode = 0;
-    }
 
     modeChangeRequested = false;
   }
@@ -312,9 +299,7 @@ void loop(void) {
 
       // increment value (reset after 7)
       rgbValue++;
-      if (rgbValue > 7) {
+      if (rgbValue > 7) { rgbValue = 0; }
-        rgbValue = 0;
-      }
 
       // output new values
       digitalWrite(12, rgbValue & 0b001);
@@ -329,4 +314,3 @@ void loop(void) {
       break;
   }
 }
-

libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino

@@ -31,9 +31,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
 }
@@ -57,9 +55,7 @@ void setup(void) {
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   server.on("/", handleRoot);
 

libraries/ESP8266WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino

@@ -99,9 +99,7 @@ void handleNotFound(){
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i=0; i<server.args(); i++){
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
 }
@@ -127,9 +125,7 @@ void setup(void){
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   server.getServer().setRSACert(new BearSSL::X509List(serverCert), new BearSSL::PrivateKey(serverKey));
 
@@ -152,17 +148,20 @@ extern "C" void stack_thunk_dump_stack();
 
 void processKey(Print& out, int hotKey) {
   switch (hotKey) {
-    case 'd': {
+    case 'd':
+      {
         HeapSelectDram ephemeral;
         umm_info(NULL, true);
         break;
       }
-    case 'i': {
+    case 'i':
+      {
         HeapSelectIram ephemeral;
         umm_info(NULL, true);
         break;
       }
-    case 'h': {
+    case 'h':
+      {
         {
           HeapSelectIram ephemeral;
           Serial.printf(PSTR("IRAM ESP.getFreeHeap:  %u\n"), ESP.getFreeHeap());
@@ -185,10 +184,8 @@ void processKey(Print& out, int hotKey) {
       out.printf_P(PSTR("Restart, ESP.restart(); ...\r\n"));
       ESP.restart();
       break;
-    case '\r':
+    case '\r': out.println();
-      out.println();
+    case '\n': break;
-    case '\n':
-      break;
     case '?':
       out.println();
       out.println(F("Press a key + <enter>"));

libraries/ESP8266WebServer/examples/HttpHashCredAuth/HttpHashCredAuth.ino

@@ -156,9 +156,7 @@ bool session_authenticated() {
 // This function sends a simple webpage for changing login credentials to the client
 void showcredentialpage() {
   Serial.println("Show credential page called.");
-  if(!session_authenticated()){
+  if (!session_authenticated()) { return; }
-    return;
-  }
 
   Serial.println("Forming credential modification page.");
 
@@ -169,7 +167,8 @@ void showcredentialpage(){
     R"(
   <h2>Login Credentials</h2><br>
 
-  <form action=")" + change_creds + R"(" method="post">
+  <form action=")"
+    + change_creds + R"(" method="post">
   Login:<br>
   <input type="text" name="login"><br>
   Password:<br>
@@ -178,8 +177,7 @@ void showcredentialpage(){
   <input type="password" name="password_duplicate"><br>
   <p><button type="submit" name="newcredentials">Change Credentials</button></p>
   </form><br>
-  )"
+  )";
-  ;
 
   page += R"(</html>)";
 
@@ -189,8 +187,7 @@ void showcredentialpage(){
 }
 
 // Saves credentials to LittleFS
-void savecredentials(String new_login, String new_password)
+void savecredentials(String new_login, String new_password) {
-{
   // Set global variables to new values
   login = new_login;
   H1 = ESP8266WebServer::credentialHash(new_login, realm, new_password);
@@ -210,8 +207,7 @@ void savecredentials(String new_login, String new_password)
 }
 
 // loads credentials from LittleFS
-void loadcredentials()
+void loadcredentials() {
-{
   Serial.println("Searching for credentials.");
   File f;
   f = LittleFS.open(file_credentials, "r");
@@ -237,9 +233,7 @@ void loadcredentials()
 // This function handles a credential change from a client.
 void handlecredentialchange() {
   Serial.println("Handle credential change called.");
-  if(!session_authenticated()){
+  if (!session_authenticated()) { return; }
-    return;
-  }
 
   Serial.println("Handling credential change request from client.");
 

libraries/ESP8266WebServer/examples/PathArgServer/PathArgServer.ino

@@ -33,9 +33,7 @@ void setup(void) {
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   server.on(F("/"), []() {
     server.send(200, "text/plain", "hello from esp8266!");

libraries/ESP8266WebServer/examples/PostServer/PostServer.ino

@@ -62,9 +62,7 @@ void handleForm() {
   } else {
     digitalWrite(led, 1);
     String message = "POST form was:\n";
-    for (uint8_t i = 0; i < server.args(); i++) {
+    for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-      message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-    }
     server.send(200, "text/plain", message);
     digitalWrite(led, 0);
   }
@@ -80,9 +78,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
 }
@@ -105,9 +101,7 @@ void setup(void) {
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   server.on("/", handleRoot);
 

libraries/ESP8266WebServer/examples/ServerSentEvents/ServerSentEvents.ino

@@ -76,17 +76,13 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
   server.send(404, "text/plain", message);
 }
 
 void SSEKeepAlive() {
   for (uint8_t i = 0; i < SSE_MAX_CHANNELS; i++) {
-    if (!(subscription[i].clientIP)) {
+    if (!(subscription[i].clientIP)) { continue; }
-      continue;
-    }
     if (subscription[i].client.connected()) {
       Serial.printf_P(PSTR("SSEKeepAlive - client is still listening on channel %d\n"), i);
       subscription[i].client.println(F("event: event\ndata: { \"TYPE\":\"KEEP-ALIVE\" }\n"));  // Extra newline required by SSE standard
@@ -122,28 +118,20 @@ void SSEHandler(uint8_t channel) {
 void handleAll() {
   const char *uri = server.uri().c_str();
   const char *restEvents = PSTR("/rest/events/");
-  if (strncmp_P(uri, restEvents, strlen_P(restEvents))) {
+  if (strncmp_P(uri, restEvents, strlen_P(restEvents))) { return handleNotFound(); }
-    return handleNotFound();
-  }
   uri += strlen_P(restEvents);  // Skip the "/rest/events/" and get to the channel number
   unsigned int channel = atoi(uri);
-  if (channel < SSE_MAX_CHANNELS) {
+  if (channel < SSE_MAX_CHANNELS) { return SSEHandler(channel); }
-    return SSEHandler(channel);
-  }
   handleNotFound();
 };
 
 void SSEBroadcastState(const char *sensorName, unsigned short prevSensorValue, unsigned short sensorValue) {
   for (uint8_t i = 0; i < SSE_MAX_CHANNELS; i++) {
-    if (!(subscription[i].clientIP)) {
+    if (!(subscription[i].clientIP)) { continue; }
-      continue;
-    }
     String IPaddrstr = IPAddress(subscription[i].clientIP).toString();
     if (subscription[i].client.connected()) {
-      Serial.printf_P(PSTR("broadcast status change to client IP %s on channel %d for %s with new state %d\n"),
+      Serial.printf_P(PSTR("broadcast status change to client IP %s on channel %d for %s with new state %d\n"), IPaddrstr.c_str(), i, sensorName, sensorValue);
-                      IPaddrstr.c_str(), i, sensorName, sensorValue);
+      subscription[i].client.printf_P(PSTR("event: event\ndata: {\"TYPE\":\"STATE\", \"%s\":{\"state\":%d, \"prevState\":%d}}\n\n"), sensorName, sensorValue, prevSensorValue);
-      subscription[i].client.printf_P(PSTR("event: event\ndata: {\"TYPE\":\"STATE\", \"%s\":{\"state\":%d, \"prevState\":%d}}\n\n"),
-                                      sensorName, sensorValue, prevSensorValue);
     } else {
       Serial.printf_P(PSTR("SSEBroadcastState - client %s registered on channel %d but not listening\n"), IPaddrstr.c_str(), i);
     }
@@ -177,9 +165,7 @@ void handleSubscribe() {
 
   ++subscriptionCount;
   for (channel = 0; channel < SSE_MAX_CHANNELS; channel++)  // Find first free slot
-    if (!subscription[channel].clientIP) {
+    if (!subscription[channel].clientIP) { break; }
-      break;
-    }
   subscription[channel] = { clientIP, server.client(), Ticker() };
   SSEurl += channel;
   Serial.printf_P(PSTR("Allocated channel %d, on uri %s\n"), channel, SSEurl.substring(offset).c_str());
@@ -205,9 +191,7 @@ void setup(void) {
     Serial.print(".");
   }
   Serial.printf_P(PSTR("\nConnected to %s with IP address: %s\n"), ssid, WiFi.localIP().toString().c_str());
-  if (MDNS.begin("esp8266")) {
+  if (MDNS.begin("esp8266")) { Serial.println("MDNS responder started"); }
-    Serial.println("MDNS responder started");
-  }
 
   startServers();  // start web and SSE servers
   sensor[0].name = "sensorA";

libraries/ESP8266WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino

@@ -75,9 +75,7 @@ void handleRoot() {
     return;
   }
   String content = "<html><body><H2>hello, you successfully connected to esp8266!</H2><br>";
-  if (server.hasHeader("User-Agent")) {
+  if (server.hasHeader("User-Agent")) { content += "the user agent used is : " + server.header("User-Agent") + "<br><br>"; }
-    content += "the user agent used is : " + server.header("User-Agent") + "<br><br>";
-  }
   content += "You can access this page until you <a href=\"/login?DISCONNECT=YES\">disconnect</a></body></html>";
   server.send(200, "text/html", content);
 }
@@ -92,9 +90,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
-    message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
-  }
   server.send(404, "text/plain", message);
 }
 

libraries/ESP8266WebServer/examples/WebServer/WebServer.ino

@@ -41,9 +41,7 @@ void handleRedirect() {
   TRACE("Redirect...");
   String url = "/index.htm";
 
-  if (!LittleFS.exists(url)) {
+  if (!LittleFS.exists(url)) { url = "/$update.htm"; }
-    url = "/$update.htm";
-  }
 
   server.sendHeader("Location", url, true);
   server.send(302);
@@ -58,9 +56,7 @@ void handleListFiles() {
 
   result += "[\n";
   while (dir.next()) {
-    if (result.length() > 4) {
+    if (result.length() > 4) { result += ","; }
-      result += ",";
-    }
     result += "  {";
     result += " \"name\": \"" + dir.fileName() + "\", ";
     result += " \"size\": " + String(dir.fileSize()) + ", ";
@@ -125,17 +121,13 @@ class FileServerHandler : public RequestHandler {
   bool handle(ESP8266WebServer &server, HTTPMethod requestMethod, const String &requestUri) override {
     // ensure that filename starts with '/'
     String fName = requestUri;
-      if (!fName.startsWith("/")) {
+    if (!fName.startsWith("/")) { fName = "/" + fName; }
-        fName = "/" + fName;
-      }
 
     if (requestMethod == HTTP_POST) {
       // all done in upload. no other forms.
 
     } else if (requestMethod == HTTP_DELETE) {
-        if (LittleFS.exists(fName)) {
+      if (LittleFS.exists(fName)) { LittleFS.remove(fName); }
-          LittleFS.remove(fName);
-        }
     }  // if
 
     server.send(200);  // all done.
@@ -147,28 +139,20 @@ class FileServerHandler : public RequestHandler {
   void upload(ESP8266WebServer UNUSED &server, const String UNUSED &_requestUri, HTTPUpload &upload) override {
     // ensure that filename starts with '/'
     String fName = upload.filename;
-      if (!fName.startsWith("/")) {
+    if (!fName.startsWith("/")) { fName = "/" + fName; }
-        fName = "/" + fName;
-      }
 
     if (upload.status == UPLOAD_FILE_START) {
       // Open the file
-        if (LittleFS.exists(fName)) {
+      if (LittleFS.exists(fName)) { LittleFS.remove(fName); }  // if
-          LittleFS.remove(fName);
-        } // if
       _fsUploadFile = LittleFS.open(fName, "w");
 
     } else if (upload.status == UPLOAD_FILE_WRITE) {
       // Write received bytes
-        if (_fsUploadFile) {
+      if (_fsUploadFile) { _fsUploadFile.write(upload.buf, upload.currentSize); }
-          _fsUploadFile.write(upload.buf, upload.currentSize);
-        }
 
     } else if (upload.status == UPLOAD_FILE_END) {
       // Close the file
-        if (_fsUploadFile) {
+      if (_fsUploadFile) { _fsUploadFile.close(); }
-          _fsUploadFile.close();
-        }
     }  // if
   }    // upload()
 

libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino

@@ -31,11 +31,13 @@ void setup(void) {
       server.sendHeader("Connection", "close");
       server.send(200, "text/html", serverIndex);
     });
-    server.on("/update", HTTP_POST, []() {
+    server.on(
+      "/update", HTTP_POST, []() {
         server.sendHeader("Connection", "close");
         server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
         ESP.restart();
-    }, []() {
+      },
+      []() {
         HTTPUpload& upload = server.upload();
         if (upload.status == UPLOAD_FILE_START) {
           Serial.setDebugOutput(true);

libraries/ESP8266WiFi/examples/BearSSL_CertStore/BearSSL_CertStore.ino

@@ -72,9 +72,7 @@ void setClock() {
 
 // Try and connect using a WiFiClientBearSSL to specified host:port and dump URL
 void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_t port, const char *path) {
-  if (!path) {
+  if (!path) { path = "/"; }
-    path = "/";
-  }
 
   Serial.printf("Trying: %s:443...", host);
   client->connect(host, port);
@@ -96,9 +94,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
       memset(tmp, 0, 32);
       int rlen = client->read((uint8_t *)tmp, sizeof(tmp) - 1);
       yield();
-      if (rlen < 0) {
+      if (rlen < 0) { break; }
-        break;
-      }
       // Only print out first line up to \r, then abort connection
       char *nl = strchr(tmp, '\r');
       if (nl) {
@@ -156,9 +152,7 @@ void setup() {
 void loop() {
   Serial.printf("\nPlease enter a website address (www.blah.com) to connect to: ");
   String site;
-  do {
+  do { site = Serial.readString(); } while (site == "");
-    site = Serial.readString();
-  } while (site == "");
   // Strip newline if present
   site.replace(String("\r"), emptyString);
   site.replace(String("\n"), emptyString);
@@ -170,4 +164,3 @@ void loop() {
   fetchURL(bear, site.c_str(), 443, "/");
   delete bear;
 }
-

libraries/ESP8266WiFi/examples/BearSSL_MaxFragmentLength/BearSSL_MaxFragmentLength.ino

@@ -24,9 +24,7 @@ void fetch(BearSSL::WiFiClientSecure *client) {
     char tmp[32];
     int rlen = client->read((uint8_t *)tmp, sizeof(tmp) - 1);
     yield();
-    if (rlen < 0) {
+    if (rlen < 0) { break; }
-      break;
-    }
     if (rlen == 0) {
       delay(10);  // Give background processes some time
       continue;
@@ -82,9 +80,7 @@ int fetchMaxFragmentLength() {
   bool mfln = client.probeMaxFragmentLength("tls.mbed.org", 443, 512);
   Serial.printf("\nConnecting to https://tls.mbed.org\n");
   Serial.printf("MFLN supported: %s\n", mfln ? "yes" : "no");
-  if (mfln) {
+  if (mfln) { client.setBufferSizes(512, 512); }
-    client.setBufferSizes(512, 512);
-  }
   client.connect("tls.mbed.org", 443);
   if (client.connected()) {
     Serial.printf("MFLN status: %s\n", client.getMFLNStatus() ? "true" : "false");

libraries/ESP8266WiFi/examples/BearSSL_Server/BearSSL_Server.ino

@@ -193,8 +193,7 @@ void setup() {
   server.begin();
 }
 
-static const char *HTTP_RES =
+static const char *HTTP_RES = "HTTP/1.0 200 OK\r\n"
-        "HTTP/1.0 200 OK\r\n"
                               "Connection: close\r\n"
                               "Content-Length: 62\r\n"
                               "Content-Type: text/html; charset=iso-8859-1\r\n"
@@ -208,9 +207,7 @@ static const char *HTTP_RES =
 void loop() {
   static int cnt;
   BearSSL::WiFiClientSecure incoming = server.accept();
-  if (!incoming) {
+  if (!incoming) { return; }
-    return;
-  }
   Serial.printf("Incoming connection...%d\n", cnt++);
 
   // Ugly way to wait for \r\n (i.e. end of HTTP request which we don't actually parse here)
@@ -228,9 +225,7 @@ void loop() {
     } else if (x == 0x0D) {
       continue;
     } else if (x == 0x0A) {
-      if (lcwn) {
+      if (lcwn) { break; }
-        break;
-      }
       lcwn = 1;
     } else
       lcwn = 0;

libraries/ESP8266WiFi/examples/BearSSL_ServerClientCert/BearSSL_ServerClientCert.ino

@@ -160,8 +160,7 @@ seoK24dHmt6tWmn/sbxX7Aa6TL/4mVlFoOgcaTJyVaY/BrY=
 // head of the app.
 
 // Set time via NTP, as required for x.509 validation
-void setClock()
+void setClock() {
-{
   configTime(3 * 3600, 0, "pool.ntp.org", "time.nist.gov");
 
   Serial.print("Waiting for NTP time sync: ");
@@ -214,8 +213,7 @@ void setup() {
   server.begin();
 }
 
-static const char *HTTP_RES =
+static const char *HTTP_RES = "HTTP/1.0 200 OK\r\n"
-        "HTTP/1.0 200 OK\r\n"
                               "Connection: close\r\n"
                               "Content-Length: 59\r\n"
                               "Content-Type: text/html; charset=iso-8859-1\r\n"
@@ -228,9 +226,7 @@ static const char *HTTP_RES =
 
 void loop() {
   BearSSL::WiFiClientSecure incoming = server.accept();
-  if (!incoming) {
+  if (!incoming) { return; }
-    return;
-  }
   Serial.println("Incoming connection...\n");
 
   // Ugly way to wait for \r\n (i.e. end of HTTP request which we don't actually parse here)
@@ -248,9 +244,7 @@ void loop() {
     } else if (x == 0x0D) {
       continue;
     } else if (x == 0x0A) {
-      if (lcwn) {
+      if (lcwn) { break; }
-        break;
-      }
       lcwn = 1;
     } else
       lcwn = 0;

libraries/ESP8266WiFi/examples/BearSSL_Sessions/BearSSL_Sessions.ino

@@ -53,9 +53,7 @@ void setup() {
 
 // Try and connect using a WiFiClientBearSSL to specified host:port and dump HTTP response
 void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_t port, const char *path) {
-  if (!path) {
+  if (!path) { path = "/"; }
-    path = "/";
-  }
 
   Serial.printf("Trying: %s:443...", host);
   client->connect(host, port);
@@ -77,9 +75,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
       memset(tmp, 0, 32);
       int rlen = client->read((uint8_t *)tmp, sizeof(tmp) - 1);
       yield();
-      if (rlen < 0) {
+      if (rlen < 0) { break; }
-        break;
-      }
       // Only print out first line up to \r, then abort connection
       char *nl = strchr(tmp, '\r');
       if (nl) {
@@ -132,4 +128,3 @@ void loop() {
 
   delay(10000);  // Avoid DDOSing github
 }
-

libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino

@@ -40,9 +40,7 @@ void setClock() {
 
 // Try and connect using a WiFiClientBearSSL to specified host:port and dump HTTP response
 void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_t port, const char *path) {
-  if (!path) {
+  if (!path) { path = "/"; }
-    path = "/";
-  }
 
   ESP.resetFreeContStack();
   uint32_t freeStackStart = ESP.getFreeContStack();
@@ -66,9 +64,7 @@ void fetchURL(BearSSL::WiFiClientSecure *client, const char *host, const uint16_
       memset(tmp, 0, 32);
       int rlen = client->read((uint8_t *)tmp, sizeof(tmp) - 1);
       yield();
-      if (rlen < 0) {
+      if (rlen < 0) { break; }
-        break;
-      }
       // Only print out first line up to \r, then abort connection
       char *nl = strchr(tmp, '\r');
       if (nl) {

libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino

@@ -74,10 +74,7 @@ void setup() {
   Serial.print("Requesting URL: ");
   Serial.println(url);
 
-  client.print(String("GET ") + url + " HTTP/1.1\r\n" +
+  client.print(String("GET ") + url + " HTTP/1.1\r\n" + "Host: " + github_host + "\r\n" + "User-Agent: BuildFailureDetectorESP8266\r\n" + "Connection: close\r\n\r\n");
-               "Host: " + github_host + "\r\n" +
-               "User-Agent: BuildFailureDetectorESP8266\r\n" +
-               "Connection: close\r\n\r\n");
 
   Serial.println("Request sent");
   while (client.connected()) {
@@ -100,5 +97,4 @@ void setup() {
   Serial.println("Closing connection");
 }
 
-void loop() {
+void loop() {}
-}

libraries/ESP8266WiFi/examples/IPv6/IPv6.ino

@@ -71,29 +71,17 @@ void status(Print& out) {
 
   for (int i = 0; i < DNS_MAX_SERVERS; i++) {
     IPAddress dns = WiFi.dnsIP(i);
-    if (dns.isSet()) {
+    if (dns.isSet()) { out.printf("dns%d: %s\n", i, dns.toString().c_str()); }
-      out.printf("dns%d: %s\n", i, dns.toString().c_str());
-    }
   }
 
   out.println(F("Try me at these addresses:"));
   out.println(F("(with 'telnet <addr> or 'nc -u <addr> 23')"));
   for (auto a : addrList) {
-    out.printf("IF='%s' IPv6=%d local=%d hostname='%s' addr= %s",
+    out.printf("IF='%s' IPv6=%d local=%d hostname='%s' addr= %s", a.ifname().c_str(), a.isV6(), a.isLocal(), a.ifhostname(), a.toString().c_str());
-               a.ifname().c_str(),
-               a.isV6(),
-               a.isLocal(),
-               a.ifhostname(),
-               a.toString().c_str());
 
-    if (a.isLegacy()) {
+    if (a.isLegacy()) { out.printf(" / mask:%s / gw:%s", a.netmask().toString().c_str(), a.gw().toString().c_str()); }
-      out.printf(" / mask:%s / gw:%s",
-                 a.netmask().toString().c_str(),
-                 a.gw().toString().c_str());
-    }
 
     out.println();
-
   }
 
   // lwIP's dns client will ask for IPv4 first (by default)
@@ -148,9 +136,7 @@ void setup() {
       if ((configured = !addr.isLocal()
            // && addr.isV6() // uncomment when IPv6 is mandatory
            // && addr.ifnumber() == STATION_IF
-          )) {
+           )) { break; }
-        break;
-      }
     Serial.print('.');
     delay(500);
   }
@@ -189,9 +175,7 @@ void loop() {
     Serial.print(F(" :"));
     Serial.println(udp.remotePort());
     int c;
-    while ((c = udp.read()) >= 0) {
+    while ((c = udp.read()) >= 0) { Serial.write(c); }
-      Serial.write(c);
-    }
 
     // send a reply, to the IP address and port that sent us the packet we received
     udp.beginPacket(udp.remoteIP(), udp.remotePort());
@@ -200,8 +184,5 @@ void loop() {
   }
 
 
-  if (showStatusOnSerialNow) {
+  if (showStatusOnSerialNow) { status(Serial); }
-    status(Serial);
-  }
-
 }

libraries/ESP8266WiFi/examples/RangeExtender-NAPT/RangeExtender-NAPT.ino

@@ -51,19 +51,14 @@ void setup() {
     Serial.print('.');
     delay(500);
   }
-  Serial.printf("\nSTA: %s (dns: %s / %s)\n",
+  Serial.printf("\nSTA: %s (dns: %s / %s)\n", WiFi.localIP().toString().c_str(), WiFi.dnsIP(0).toString().c_str(), WiFi.dnsIP(1).toString().c_str());
-                WiFi.localIP().toString().c_str(),
-                WiFi.dnsIP(0).toString().c_str(),
-                WiFi.dnsIP(1).toString().c_str());
 
   // give DNS servers to AP side
   dhcpSoftAP.dhcps_set_dns(0, WiFi.dnsIP(0));
   dhcpSoftAP.dhcps_set_dns(1, WiFi.dnsIP(1));
 
   WiFi.softAPConfig(  // enable AP, with android-compatible google domain
-    IPAddress(172, 217, 28, 254),
+    IPAddress(172, 217, 28, 254), IPAddress(172, 217, 28, 254), IPAddress(255, 255, 255, 0));
-    IPAddress(172, 217, 28, 254),
-    IPAddress(255, 255, 255, 0));
   WiFi.softAP(STASSID "extender", STAPSK);
   Serial.printf("AP: %s\n", WiFi.softAPIP().toString().c_str());
 
@@ -73,14 +68,10 @@ void setup() {
   if (ret == ERR_OK) {
     ret = ip_napt_enable_no(SOFTAP_IF, 1);
     Serial.printf("ip_napt_enable_no(SOFTAP_IF): ret=%d (OK=%d)\n", (int)ret, (int)ERR_OK);
-    if (ret == ERR_OK) {
+    if (ret == ERR_OK) { Serial.printf("WiFi Network '%s' with same password is now NATed behind '%s'\n", STASSID "extender", STASSID); }
-      Serial.printf("WiFi Network '%s' with same password is now NATed behind '%s'\n", STASSID "extender", STASSID);
-    }
   }
   Serial.printf("Heap after napt init: %d\n", ESP.getFreeHeap());
-  if (ret != ERR_OK) {
+  if (ret != ERR_OK) { Serial.printf("NAPT initialization failed\n"); }
-    Serial.printf("NAPT initialization failed\n");
-  }
 }
 
 #else
@@ -92,6 +83,4 @@ void setup() {
 
 #endif
 
-void loop() {
+void loop() {}
-}
-

libraries/ESP8266WiFi/examples/Udp/Udp.ino

@@ -49,11 +49,7 @@ void loop() {
   // if there's data available, read a packet
   int packetSize = Udp.parsePacket();
   if (packetSize) {
-    Serial.printf("Received packet of size %d from %s:%d\n    (to %s:%d, free heap = %d B)\n",
+    Serial.printf("Received packet of size %d from %s:%d\n    (to %s:%d, free heap = %d B)\n", packetSize, Udp.remoteIP().toString().c_str(), Udp.remotePort(), Udp.destinationIP().toString().c_str(), Udp.localPort(), ESP.getFreeHeap());
-                  packetSize,
-                  Udp.remoteIP().toString().c_str(), Udp.remotePort(),
-                  Udp.destinationIP().toString().c_str(), Udp.localPort(),
-                  ESP.getFreeHeap());
 
     // read the packet into packetBufffer
     int n = Udp.read(packetBuffer, UDP_TX_PACKET_MAX_SIZE);
@@ -66,7 +62,6 @@ void loop() {
     Udp.write(ReplyBuffer);
     Udp.endPacket();
   }
-
 }
 
 /*

libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino

@@ -61,9 +61,7 @@ void loop() {
 
   // This will send a string to the server
   Serial.println("sending data to server");
-  if (client.connected()) {
+  if (client.connected()) { client.println("hello from ESP8266"); }
-    client.println("hello from ESP8266");
-  }
 
   // wait for data to be available
   unsigned long timeout = millis();

libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino

@@ -75,4 +75,3 @@ void loop() {
   Serial.println("wait 5 sec...");
   delay(5000);
 }
-

libraries/ESP8266WiFi/examples/WiFiEcho/WiFiEcho.ino

@@ -63,15 +63,9 @@ void loop() {
   static uint32_t cnt = 0;
   if (test && cnt) {
     Serial.printf("measured-block-size=%u min-free-stack=%u", tot / cnt, ESP.getFreeContStack());
-    if (t == 2 && sizes[s]) {
+    if (t == 2 && sizes[s]) { Serial.printf(" (blocks: at most %d bytes)", sizes[s]); }
-      Serial.printf(" (blocks: at most %d bytes)", sizes[s]);
+    if (t == 3 && sizes[s]) { Serial.printf(" (blocks: exactly %d bytes)", sizes[s]); }
-    }
+    if (t == 3 && !sizes[s]) { Serial.printf(" (blocks: any size)"); }
-    if (t == 3 && sizes[s]) {
-      Serial.printf(" (blocks: exactly %d bytes)", sizes[s]);
-    }
-    if (t == 3 && !sizes[s]) {
-      Serial.printf(" (blocks: any size)");
-    }
     Serial.printf("\n");
   }
 
@@ -84,10 +78,25 @@ void loop() {
   if (Serial.available()) {
     s = (s + 1) % (sizeof(sizes) / sizeof(sizes[0]));
     switch (Serial.read()) {
-      case '1': if (t != 1) s = 0; t = 1; Serial.println("byte-by-byte (watch then press 2, 3 or 4)"); break;
+      case '1':
-      case '2': if (t != 2) s = 1; t = 2; Serial.printf("through buffer (watch then press 2 again, or 1, 3 or 4)\n"); break;
+        if (t != 1) s = 0;
-      case '3': if (t != 3) s = 0; t = 3; Serial.printf("direct access (sendAvailable - watch then press 3 again, or 1, 2 or 4)\n"); break;
+        t = 1;
-      case '4':                    t = 4; Serial.printf("direct access (sendAll - close peer to stop, then press 1, 2 or 3 before restarting peer)\n"); break;
+        Serial.println("byte-by-byte (watch then press 2, 3 or 4)");
+        break;
+      case '2':
+        if (t != 2) s = 1;
+        t = 2;
+        Serial.printf("through buffer (watch then press 2 again, or 1, 3 or 4)\n");
+        break;
+      case '3':
+        if (t != 3) s = 0;
+        t = 3;
+        Serial.printf("direct access (sendAvailable - watch then press 3 again, or 1, 2 or 4)\n");
+        break;
+      case '4':
+        t = 4;
+        Serial.printf("direct access (sendAll - close peer to stop, then press 1, 2 or 3 before restarting peer)\n");
+        break;
     }
     tot = cnt = 0;
     ESP.resetFreeContStack();
@@ -113,9 +122,7 @@ void loop() {
       uint8_t buf[maxTo];
       size_t tcp_got = client.read(buf, maxTo);
       size_t tcp_sent = client.write(buf, tcp_got);
-      if (tcp_sent != maxTo) {
+      if (tcp_sent != maxTo) { Serial.printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxTo, tcp_got, tcp_sent); }
-        Serial.printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxTo, tcp_got, tcp_sent);
-      }
       tot += tcp_sent;
       cnt++;
     }
@@ -152,5 +159,4 @@ void loop() {
       case Stream::Report::ShortOperation: Serial.println("Stream::send: short transfer"); break;
     }
   }
-
 }

libraries/ESP8266WiFi/examples/WiFiEvents/WiFiEvents.ino

@@ -98,7 +98,6 @@ void loop() {
 
 String macToString(const unsigned char* mac) {
   char buf[20];
-  snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x",
+  snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-           mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
   return String(buf);
 }

libraries/ESP8266WiFi/examples/WiFiManualWebServer/WiFiManualWebServer.ino

@@ -55,9 +55,7 @@ void setup() {
 void loop() {
   // Check if a client has connected
   WiFiClient client = server.accept();
-  if (!client) {
+  if (!client) { return; }
-    return;
-  }
   Serial.println(F("new client"));
 
   client.setTimeout(5000);  // default is 1000

libraries/ESP8266WiFi/examples/WiFiScan/WiFiScan.ino

@@ -40,15 +40,7 @@ void loop() {
     for (int8_t i = 0; i < scanResult; i++) {
       WiFi.getNetworkInfo(i, ssid, encryptionType, rssi, bssid, channel, hidden);
 
-      Serial.printf(PSTR("  %02d: [CH %02d] [%02X:%02X:%02X:%02X:%02X:%02X] %ddBm %c %c %s\n"),
+      Serial.printf(PSTR("  %02d: [CH %02d] [%02X:%02X:%02X:%02X:%02X:%02X] %ddBm %c %c %s\n"), i, channel, bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5], rssi, (encryptionType == ENC_TYPE_NONE) ? ' ' : '*', hidden ? 'H' : 'V', ssid.c_str());
-                    i,
-                    channel,
-                    bssid[0], bssid[1], bssid[2],
-                    bssid[3], bssid[4], bssid[5],
-                    rssi,
-                    (encryptionType == ENC_TYPE_NONE) ? ' ' : '*',
-                    hidden ? 'H' : 'V',
-                    ssid.c_str());
       yield();
     }
   } else {

libraries/ESP8266WiFi/examples/WiFiShutdown/WiFiShutdown.ino

@@ -39,14 +39,11 @@ void setup() {
   ESP.rtcUserMemoryRead(RTC_USER_DATA_SLOT_WIFI_STATE, reinterpret_cast<uint32_t*>(&state), sizeof(state));
   unsigned long start = millis();
 
-  if (!WiFi.resumeFromShutdown(state)
+  if (!WiFi.resumeFromShutdown(state) || (WiFi.waitForConnectResult(10000) != WL_CONNECTED)) {
-      || (WiFi.waitForConnectResult(10000) != WL_CONNECTED)) {
     Serial.println("Cannot resume WiFi connection, connecting via begin...");
     WiFi.persistent(false);
 
-    if (!WiFi.mode(WIFI_STA)
+    if (!WiFi.mode(WIFI_STA) || !WiFi.begin(ssid, password) || (WiFi.waitForConnectResult(10000) != WL_CONNECTED)) {
-        || !WiFi.begin(ssid, password)
-        || (WiFi.waitForConnectResult(10000) != WL_CONNECTED)) {
       WiFi.mode(WIFI_OFF);
       Serial.println("Cannot connect!");
       Serial.flush();

libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino

@@ -165,9 +165,7 @@ void loop() {
       uint8_t buf[maxToSerial];
       size_t tcp_got = serverClients[i].read(buf, maxToSerial);
       size_t serial_sent = Serial.write(buf, tcp_got);
-      if (serial_sent != maxToSerial) {
+      if (serial_sent != maxToSerial) { logger->printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxToSerial, tcp_got, serial_sent); }
-        logger->printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxToSerial, tcp_got, serial_sent);
-      }
     }
 #endif
 
@@ -202,9 +200,7 @@ void loop() {
       // ensure write space is sufficient:
       if (serverClients[i].availableForWrite() >= serial_got) {
         size_t tcp_sent = serverClients[i].write(sbuf, serial_got);
-        if (tcp_sent != len) {
+        if (tcp_sent != len) { logger->printf("len mismatch: available:%zd serial-read:%zd tcp-write:%zd\n", len, serial_got, tcp_sent); }
-          logger->printf("len mismatch: available:%zd serial-read:%zd tcp-write:%zd\n", len, serial_got, tcp_sent);
-        }
       }
   }
 }

libraries/ESP8266WiFiMesh/examples/HelloEspnow/HelloEspnow.ino

@@ -26,14 +26,11 @@ constexpr char exampleWiFiPassword[] PROGMEM = "ChangeThisWiFiPassword_TODO"; //
 // All ESP-NOW keys below must match in an encrypted connection pair for encrypted communication to be possible.
 // Note that it is also possible to use Strings as key seeds instead of arrays.
 uint8_t espnowEncryptedConnectionKey[16] = { 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44,  // This is the key for encrypting transmissions of encrypted connections.
-                                            0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11
+                                             0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11 };
-                                           };
 uint8_t espnowEncryptionKok[16] = { 0x22, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44,  // This is the key for encrypting the encrypted connection key.
-                                   0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x33
+                                    0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x33 };
-                                  };
 uint8_t espnowHashKey[16] = { 0xEF, 0x44, 0x33, 0x0C, 0x33, 0x44, 0xFE, 0x44,  // This is the secret key used for HMAC during encrypted connection requests.
-                             0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD
+                              0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD };
-                            };
 
 unsigned int requestNumber = 0;
 unsigned int responseNumber = 0;
@@ -310,9 +307,7 @@ void loop() {
     espnowDelay(100);
 
     // One way to check how attemptTransmission worked out
-    if (espnowNode.latestTransmissionSuccessful()) {
+    if (espnowNode.latestTransmissionSuccessful()) { Serial.println(F("Transmission successful.")); }
-      Serial.println(F("Transmission successful."));
-    }
 
     // Another way to check how attemptTransmission worked out
     if (espnowNode.latestTransmissionOutcomes().empty()) {
@@ -445,8 +440,7 @@ void loop() {
       }
 
       // Our last request was sent to all nodes found, so time to create a new request.
-      espnowNode.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ")
+      espnowNode.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ") + espnowNode.getMeshName() + espnowNode.getNodeID() + String('.'));
-                            + espnowNode.getMeshName() + espnowNode.getNodeID() + String('.'));
     }
 
     Serial.println();

libraries/ESP8266WiFiMesh/examples/HelloMesh/HelloMesh.ino

@@ -35,11 +35,9 @@ constexpr char exampleWiFiPassword[] PROGMEM = "ChangeThisWiFiPassword_TODO"; //
 // All ESP-NOW keys below must match in an encrypted connection pair for encrypted communication to be possible.
 // Note that it is also possible to use Strings as key seeds instead of arrays.
 uint8_t espnowEncryptedConnectionKey[16] = { 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44,  // This is the key for encrypting transmissions of encrypted connections.
-                                            0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11
+                                             0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11 };
-                                           };
 uint8_t espnowHashKey[16] = { 0xEF, 0x44, 0x33, 0x0C, 0x33, 0x44, 0xFE, 0x44,  // This is the secret key used for HMAC during encrypted connection requests.
-                             0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD
+                              0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD };
-                            };
 
 bool meshMessageHandler(String &message, FloodingMesh &meshInstance);
 
@@ -101,12 +99,8 @@ bool meshMessageHandler(String &message, FloodingMesh &meshInstance) {
         missedBroadcasts += totalBroadcasts - previousTotalBroadcasts - 1;  // We expect an increment by 1.
         previousTotalBroadcasts = totalBroadcasts;
 
-        if (totalReceivedBroadcasts % 50 == 0) {
+        if (totalReceivedBroadcasts % 50 == 0) { Serial.println(String(F("missed/total: ")) + String(missedBroadcasts) + '/' + String(totalReceivedBroadcasts)); }
-          Serial.println(String(F("missed/total: ")) + String(missedBroadcasts) + '/' + String(totalReceivedBroadcasts));
+        if (totalReceivedBroadcasts % 500 == 0) { Serial.println(String(F("Benchmark message: ")) + message.substring(0, 100)); }
-        }
-        if (totalReceivedBroadcasts % 500 == 0) {
-          Serial.println(String(F("Benchmark message: ")) + message.substring(0, 100));
-        }
       }
     }
   } else {

libraries/ESP8266WiFiMesh/examples/HelloTcpIp/HelloTcpIp.ino

@@ -145,8 +145,7 @@ bool exampleTransmissionOutcomesUpdateHook(MeshBackendBase &meshInstance) {
   if (TcpIpMeshBackend *tcpIpInstance = TypeCast::meshBackendCast<TcpIpMeshBackend *>(&meshInstance)) {
     if (tcpIpInstance->latestTransmissionOutcomes().back().transmissionStatus() == TransmissionStatusType::TRANSMISSION_COMPLETE) {
       // Our last request got a response, so time to create a new request.
-      meshInstance.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ")
+      meshInstance.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ") + meshInstance.getMeshName() + meshInstance.getNodeID() + String('.'));
-                              + meshInstance.getMeshName() + meshInstance.getNodeID() + String('.'));
     }
   } else {
     Serial.println(F("Invalid mesh backend!"));
@@ -194,9 +193,7 @@ void loop() {
     timeOfLastScan = millis();
 
     // One way to check how attemptTransmission worked out
-    if (tcpIpNode.latestTransmissionSuccessful()) {
+    if (tcpIpNode.latestTransmissionSuccessful()) { Serial.println(F("Transmission successful.")); }
-      Serial.println(F("Transmission successful."));
-    }
 
     // Another way to check how attemptTransmission worked out
     if (tcpIpNode.latestTransmissionOutcomes().empty()) {

libraries/ESP8266httpUpdate/examples/httpUpdate/httpUpdate.ino

@@ -37,8 +37,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP(APSSID, APPSK);
-
-
 }
 
 void update_started() {
@@ -83,18 +81,11 @@ void loop() {
     // t_httpUpdate_return ret = ESPhttpUpdate.update(client, "server", 80, "file.bin");
 
     switch (ret) {
-      case HTTP_UPDATE_FAILED:
+      case HTTP_UPDATE_FAILED: Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str()); break;
-        Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
-        break;
 
-      case HTTP_UPDATE_NO_UPDATES:
+      case HTTP_UPDATE_NO_UPDATES: Serial.println("HTTP_UPDATE_NO_UPDATES"); break;
-        Serial.println("HTTP_UPDATE_NO_UPDATES");
-        break;
 
-      case HTTP_UPDATE_OK:
+      case HTTP_UPDATE_OK: Serial.println("HTTP_UPDATE_OK"); break;
-        Serial.println("HTTP_UPDATE_OK");
-        break;
     }
   }
 }
-

libraries/ESP8266httpUpdate/examples/httpUpdateLittleFS/httpUpdateLittleFS.ino

@@ -37,7 +37,6 @@ void setup() {
 
   WiFi.mode(WIFI_STA);
   WiFiMulti.addAP(APSSID, APPSK);
-
 }
 
 void loop() {
@@ -62,19 +61,12 @@ void loop() {
       ret = ESPhttpUpdate.update(client, "http://server/file.bin");
 
       switch (ret) {
-        case HTTP_UPDATE_FAILED:
+        case HTTP_UPDATE_FAILED: Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str()); break;
-          Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
-          break;
 
-        case HTTP_UPDATE_NO_UPDATES:
+        case HTTP_UPDATE_NO_UPDATES: Serial.println("HTTP_UPDATE_NO_UPDATES"); break;
-          Serial.println("HTTP_UPDATE_NO_UPDATES");
-          break;
 
-        case HTTP_UPDATE_OK:
+        case HTTP_UPDATE_OK: Serial.println("HTTP_UPDATE_OK"); break;
-          Serial.println("HTTP_UPDATE_OK");
-          break;
       }
     }
   }
 }
-

libraries/ESP8266httpUpdate/examples/httpUpdateSecure/httpUpdateSecure.ino

@@ -87,9 +87,7 @@ void loop() {
     BearSSL::WiFiClientSecure client;
     bool mfln = client.probeMaxFragmentLength("server", 443, 1024);  // server must be the same as in ESPhttpUpdate.update()
     Serial.printf("MFLN supported: %s\n", mfln ? "yes" : "no");
-    if (mfln) {
+    if (mfln) { client.setBufferSizes(1024, 1024); }
-      client.setBufferSizes(1024, 1024);
-    }
     client.setCertStore(&certStore);
 
     // The line below is optional. It can be used to blink the LED on the board during flashing
@@ -106,17 +104,11 @@ void loop() {
 
 
     switch (ret) {
-      case HTTP_UPDATE_FAILED:
+      case HTTP_UPDATE_FAILED: Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str()); break;
-        Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
-        break;
 
-      case HTTP_UPDATE_NO_UPDATES:
+      case HTTP_UPDATE_NO_UPDATES: Serial.println("HTTP_UPDATE_NO_UPDATES"); break;
-        Serial.println("HTTP_UPDATE_NO_UPDATES");
-        break;
 
-      case HTTP_UPDATE_OK:
+      case HTTP_UPDATE_OK: Serial.println("HTTP_UPDATE_OK"); break;
-        Serial.println("HTTP_UPDATE_OK");
-        break;
     }
   }
 }

libraries/ESP8266httpUpdate/examples/httpUpdateSigned/httpUpdateSigned.ino

@@ -99,19 +99,12 @@ void loop() {
     t_httpUpdate_return ret = ESPhttpUpdate.update(client, "http://192.168.1.8/esp8266.bin");
 
     switch (ret) {
-      case HTTP_UPDATE_FAILED:
+      case HTTP_UPDATE_FAILED: Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str()); break;
-        Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
-        break;
 
-      case HTTP_UPDATE_NO_UPDATES:
+      case HTTP_UPDATE_NO_UPDATES: Serial.println("HTTP_UPDATE_NO_UPDATES"); break;
-        Serial.println("HTTP_UPDATE_NO_UPDATES");
-        break;
 
-      case HTTP_UPDATE_OK:
+      case HTTP_UPDATE_OK: Serial.println("HTTP_UPDATE_OK"); break;
-        Serial.println("HTTP_UPDATE_OK");
-        break;
     }
   }
   delay(10000);
 }
-

libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_Clock/mDNS_Clock.ino

@@ -73,8 +73,7 @@ const char* getTimeString(void) {
   time_t now = time(nullptr);
   ctime_r(&now, acTimeString);
   size_t stLength;
-  while (((stLength = strlen(acTimeString))) &&
+  while (((stLength = strlen(acTimeString))) && ('\n' == acTimeString[stLength - 1])) {
-         ('\n' == acTimeString[stLength - 1])) {
     acTimeString[stLength - 1] = 0;  // Remove trailing line break...
   }
   return acTimeString;
@@ -186,7 +185,8 @@ void handleHTTPRequest() {
   Serial.println("HTTP Request");
 
   // Get current time
-  time_t now = time(nullptr);;
+  time_t now = time(nullptr);
+  ;
   struct tm timeinfo;
   gmtime_r(&now, &timeinfo);
 
@@ -231,8 +231,7 @@ void setup(void) {
   // Setup MDNS responder
   MDNS.setHostProbeResultCallback(hostProbeResult);
   // Init the (currently empty) host domain string with 'esp8266'
-  if ((!MDNSResponder::indexDomain(pcHostDomain, 0, "esp8266")) ||
+  if ((!MDNSResponder::indexDomain(pcHostDomain, 0, "esp8266")) || (!MDNS.begin(pcHostDomain))) {
-      (!MDNS.begin(pcHostDomain))) {
     Serial.println("Error setting up MDNS responder!");
     while (1) {  // STOP
       delay(1000);

libraries/ESP8266mDNS/examples/LEAmDNS/mDNS_ServiceMonitor/mDNS_ServiceMonitor.ino

@@ -80,26 +80,17 @@ bool setStationHostname(const char* p_pcHostname) {
 void MDNSServiceQueryCallback(MDNSResponder::MDNSServiceInfo serviceInfo, MDNSResponder::AnswerType answerType, bool p_bSetContent) {
   String answerInfo;
   switch (answerType) {
-    case MDNSResponder::AnswerType::ServiceDomain :
+    case MDNSResponder::AnswerType::ServiceDomain: answerInfo = "ServiceDomain " + String(serviceInfo.serviceDomain()); break;
-      answerInfo = "ServiceDomain " + String(serviceInfo.serviceDomain());
+    case MDNSResponder::AnswerType::HostDomainAndPort: answerInfo = "HostDomainAndPort " + String(serviceInfo.hostDomain()) + ":" + String(serviceInfo.hostPort()); break;
-      break;
-    case MDNSResponder::AnswerType::HostDomainAndPort :
-      answerInfo = "HostDomainAndPort " + String(serviceInfo.hostDomain()) + ":" + String(serviceInfo.hostPort());
-      break;
     case MDNSResponder::AnswerType::IP4Address:
       answerInfo = "IP4Address ";
-      for (IPAddress ip : serviceInfo.IP4Adresses()) {
+      for (IPAddress ip : serviceInfo.IP4Adresses()) { answerInfo += "- " + ip.toString(); };
-        answerInfo += "- " + ip.toString();
-      };
       break;
     case MDNSResponder::AnswerType::Txt:
       answerInfo = "TXT " + String(serviceInfo.strKeyValue());
-      for (auto kv : serviceInfo.keyValues()) {
+      for (auto kv : serviceInfo.keyValues()) { answerInfo += "\nkv : " + String(kv.first) + " : " + String(kv.second); }
-        answerInfo += "\nkv : " + String(kv.first) + " : " + String(kv.second);
-      }
       break;
-    default :
+    default: answerInfo = "Unknown Answertype";
-      answerInfo = "Unknown Answertype";
   }
   Serial.printf("Answer %s %s\n", answerInfo.c_str(), p_bSetContent ? "Modified" : "Deleted");
 }
@@ -109,9 +100,7 @@ void MDNSServiceQueryCallback(MDNSResponder::MDNSServiceInfo serviceInfo, MDNSRe
    Probe result callback for Services
 */
 
-void serviceProbeResult(String p_pcServiceName,
+void serviceProbeResult(String p_pcServiceName, const MDNSResponder::hMDNSService p_hMDNSService, bool p_bProbeResult) {
-                        const MDNSResponder::hMDNSService p_hMDNSService,
-                        bool p_bProbeResult) {
   (void)p_hMDNSService;
   Serial.printf("MDNSServiceProbeResultCallback: Service %s probe %s\n", p_pcServiceName.c_str(), (p_bProbeResult ? "succeeded." : "failed!"));
 }
@@ -196,15 +185,11 @@ void handleHTTPRequest() {
     }
     if (info.IP4AddressAvailable()) {
       s += "<br/>IP4:";
-      for (auto ip : info.IP4Adresses()) {
+      for (auto ip : info.IP4Adresses()) { s += " " + ip.toString(); }
-        s += " " + ip.toString();
-      }
     }
     if (info.txtAvailable()) {
       s += "<br/>TXT:<br/>";
-      for (auto kv : info.keyValues()) {
+      for (auto kv : info.keyValues()) { s += "\t" + String(kv.first) + " : " + String(kv.second) + "<br/>"; }
-        s += "\t" + String(kv.first) + " : " + String(kv.second) + "<br/>";
-      }
     }
     s += "</li>";
   }
@@ -245,8 +230,7 @@ void setup(void) {
   MDNS.setHostProbeResultCallback(hostProbeResult);
 
   // Init the (currently empty) host domain string with 'esp8266'
-  if ((!MDNSResponder::indexDomain(pcHostDomain, 0, "esp8266")) ||
+  if ((!MDNSResponder::indexDomain(pcHostDomain, 0, "esp8266")) || (!MDNS.begin(pcHostDomain))) {
-      (!MDNS.begin(pcHostDomain))) {
     Serial.println(" Error setting up MDNS responder!");
     while (1) {  // STOP
       delay(1000);
@@ -265,6 +249,3 @@ void loop(void) {
   // Allow MDNS processing
   MDNS.update();
 }
-
-
-

libraries/ESP8266mDNS/examples/OTA-mDNS-LittleFS/OTA-mDNS-LittleFS.ino

@@ -81,9 +81,7 @@ bool loadConfig(String *ssid, String *pass) {
   if (pos == -1) {
     le = 1;
     pos = content.indexOf("\n");
-    if (pos == -1) {
+    if (pos == -1) { pos = content.indexOf("\r"); }
-      pos = content.indexOf("\r");
-    }
   }
 
   // If there is no second line: Some information is missing.
@@ -245,4 +243,3 @@ void loop() {
   // Handle OTA server.
   ArduinoOTA.handle();
 }
-

libraries/ESP8266mDNS/examples/mDNS-SD_Extended/mDNS-SD_Extended.ino

@@ -43,9 +43,7 @@ void setup() {
   Serial.print("IP address: ");
   Serial.println(WiFi.localIP());
 
-  if (!MDNS.begin(hostString)) {
+  if (!MDNS.begin(hostString)) { Serial.println("Error setting up MDNS responder!"); }
-    Serial.println("Error setting up MDNS responder!");
-  }
   Serial.println("mDNS responder started");
   MDNS.addService("esp", "tcp", 8080);  // Announce esp tcp service on port 8080
 

libraries/ESP8266mDNS/examples/mDNS_Web_Server/mDNS_Web_Server.ino

@@ -57,9 +57,7 @@ void setup(void) {
   //   we send our IP address on the WiFi network
   if (!MDNS.begin("esp8266")) {
     Serial.println("Error setting up MDNS responder!");
-    while (1) {
+    while (1) { delay(1000); }
-      delay(1000);
-    }
   }
   Serial.println("mDNS responder started");
 
@@ -77,16 +75,12 @@ void loop(void) {
 
   // Check if a client has connected
   WiFiClient client = server.accept();
-  if (!client) {
+  if (!client) { return; }
-    return;
-  }
   Serial.println("");
   Serial.println("New client");
 
   // Wait for data from client to become available
-  while (client.connected() && !client.available()) {
+  while (client.connected() && !client.available()) { delay(1); }
-    delay(1);
-  }
 
   // Read the first line of HTTP request
   String req = client.readStringUntil('\r');
@@ -121,4 +115,3 @@ void loop(void) {
 
   Serial.println("Done with client");
 }
-

libraries/ESP8266mDNS/src/ESP8266mDNS.cpp

@@ -30,4 +30,3 @@
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
 MDNSResponder MDNS;
 #endif
-

libraries/ESP8266mDNS/src/ESP8266mDNS.h

@@ -3,15 +3,19 @@
     This file is part of the esp8266 core for Arduino environment.
 
     mDNS implementation, that supports many mDNS features like:
-    - Presenting a DNS-SD service to interested observers, eg. a http server by presenting _http._tcp service
+    - Presenting a DNS-SD service to interested observers, eg. a http server by presenting
-    - Support for multi-level compressed names in input; in output only a very simple one-leven full-name compression is implemented
+   _http._tcp service
+    - Support for multi-level compressed names in input; in output only a very simple one-leven
+   full-name compression is implemented
     - Probing host and service domains for uniqueness in the local network
-    - Tiebreaking while probing is supported in a very minimalistic way (the 'higher' IP address wins the tiebreak)
+    - Tiebreaking while probing is supported in a very minimalistic way (the 'higher' IP address
+   wins the tiebreak)
     - Announcing available services after successful probing
     - Using fixed service TXT items or
     - Using dynamic service TXT items for presented services (via callback)
     - Remove services (and un-announcing them to the observers by sending goodbye-messages)
-    - Static queries for DNS-SD services (creating a fixed answer set after a certain timeout period)
+    - Static queries for DNS-SD services (creating a fixed answer set after a certain timeout
+   period)
     - Dynamic queries for DNS-SD services with cached and updated answers and user notifications
     - Support for multi-homed client host domains
 

libraries/ESP8266mDNS/src/LEAmDNS.h

@@ -11,15 +11,19 @@
     A lot of the additions were basically taken from Erik Ekman's lwIP mdns app code.
 
     Supported mDNS features (in some cases somewhat limited):
-    - Presenting a DNS-SD service to interested observers, eg. a http server by presenting _http._tcp service
+    - Presenting a DNS-SD service to interested observers, eg. a http server by presenting
-    - Support for multi-level compressed names in input; in output only a very simple one-leven full-name compression is implemented
+   _http._tcp service
+    - Support for multi-level compressed names in input; in output only a very simple one-leven
+   full-name compression is implemented
     - Probing host and service domains for uniqueness in the local network
-    - Tiebreaking while probing is supported in a very minimalistic way (the 'higher' IP address wins the tiebreak)
+    - Tiebreaking while probing is supported in a very minimalistic way (the 'higher' IP address
+   wins the tiebreak)
     - Announcing available services after successful probing
     - Using fixed service TXT items or
     - Using dynamic service TXT items for presented services (via callback)
     - Remove services (and un-announcing them to the observers by sending goodbye-messages)
-    - Static queries for DNS-SD services (creating a fixed answer set after a certain timeout period)
+    - Static queries for DNS-SD services (creating a fixed answer set after a certain timeout
+   period)
     - Dynamic queries for DNS-SD services with cached and updated answers and user notifications
 
 
@@ -30,19 +34,23 @@
 
     For presenting services:
     In 'setup()':
-      Install a callback for the probing of host (and service) domains via 'MDNS.setProbeResultCallback(probeResultCallback, &userData);'
+      Install a callback for the probing of host (and service) domains via
-      Register DNS-SD services with 'MDNSResponder::hMDNSService hService = MDNS.addService("MyESP", "http", "tcp", 5000);'
+   'MDNS.setProbeResultCallback(probeResultCallback, &userData);' Register DNS-SD services with
-      (Install additional callbacks for the probing of these service domains via 'MDNS.setServiceProbeResultCallback(hService, probeResultCallback, &userData);')
+   'MDNSResponder::hMDNSService hService = MDNS.addService("MyESP", "http", "tcp", 5000);' (Install
-      Add service TXT items with 'MDNS.addServiceTxt(hService, "c#", "1");' or by installing a service TXT callback
+   additional callbacks for the probing of these service domains via
-      using 'MDNS.setDynamicServiceTxtCallback(dynamicServiceTxtCallback, &userData);' or service specific
+   'MDNS.setServiceProbeResultCallback(hService, probeResultCallback, &userData);') Add service TXT
-      'MDNS.setDynamicServiceTxtCallback(hService, dynamicServiceTxtCallback, &userData);'
+   items with 'MDNS.addServiceTxt(hService, "c#", "1");' or by installing a service TXT callback
+      using 'MDNS.setDynamicServiceTxtCallback(dynamicServiceTxtCallback, &userData);' or service
+   specific 'MDNS.setDynamicServiceTxtCallback(hService, dynamicServiceTxtCallback, &userData);'
       Call MDNS.begin("MyHostname");
 
-    In 'probeResultCallback(MDNSResponder* p_MDNSResponder, const char* p_pcDomain, MDNSResponder:hMDNSService p_hService, bool p_bProbeResult, void* p_pUserdata)':
+    In 'probeResultCallback(MDNSResponder* p_MDNSResponder, const char* p_pcDomain,
-      Check the probe result and update the host or service domain name if the probe failed
+   MDNSResponder:hMDNSService p_hService, bool p_bProbeResult, void* p_pUserdata)': Check the probe
+   result and update the host or service domain name if the probe failed
 
-    In 'dynamicServiceTxtCallback(MDNSResponder* p_MDNSResponder, const hMDNSService p_hService, void* p_pUserdata)':
+    In 'dynamicServiceTxtCallback(MDNSResponder* p_MDNSResponder, const hMDNSService p_hService,
-      Add dynamic TXT items by calling 'MDNS.addDynamicServiceTxt(p_hService, "c#", "1");'
+   void* p_pUserdata)': Add dynamic TXT items by calling 'MDNS.addDynamicServiceTxt(p_hService,
+   "c#", "1");'
 
     In loop():
       Call 'MDNS.update();'
@@ -51,15 +59,17 @@
     For querying services:
     Static:
       Call 'uint32_t u32AnswerCount = MDNS.queryService("http", "tcp");'
-      Iterate answers by: 'for (uint32_t u=0; u<u32AnswerCount; ++u) { const char* pHostname = MDNS.answerHostname(u); }'
+      Iterate answers by: 'for (uint32_t u=0; u<u32AnswerCount; ++u) { const char* pHostname =
-      You should call MDNS.removeQuery() sometimes later (when the answers are not needed anymore)
+   MDNS.answerHostname(u); }' You should call MDNS.removeQuery() sometimes later (when the answers
+   are not needed anymore)
 
     Dynamic:
-      Install a dynamic query by calling 'DNSResponder::hMDNSServiceQuery hServiceQuery = MDNS.installServiceQuery("http", "tcp", serviceQueryCallback, &userData);'
+      Install a dynamic query by calling 'DNSResponder::hMDNSServiceQuery hServiceQuery =
-      The callback 'serviceQueryCallback(MDNSResponder* p_MDNSResponder, const hMDNSServiceQuery p_hServiceQuery, uint32_t p_u32AnswerIndex,
+   MDNS.installServiceQuery("http", "tcp", serviceQueryCallback, &userData);' The callback
-                                         enuServiceQueryAnswerType p_ServiceQueryAnswerType, bool p_bSetContent, void* p_pUserdata)'
+   'serviceQueryCallback(MDNSResponder* p_MDNSResponder, const hMDNSServiceQuery p_hServiceQuery,
-      is called for any change in the answer set.
+   uint32_t p_u32AnswerIndex, enuServiceQueryAnswerType p_ServiceQueryAnswerType, bool
-      Call 'MDNS.removeServiceQuery(hServiceQuery);' when the answers are not needed anymore
+   p_bSetContent, void* p_pUserdata)' is called for any change in the answer set. Call
+   'MDNS.removeServiceQuery(hServiceQuery);' when the answers are not needed anymore
 
 
     Reference:
@@ -69,9 +79,9 @@
     PTR (0x0C, srv name):   eg. _http._tcp.local PTR OP TTL MyESP._http._tcp.local
     PTR (0x0C, srv type):   eg. _services._dns-sd._udp.local PTR OP TTL _http._tcp.local
     PTR (0x0C, IP4):        eg. 012.789.456.123.in-addr.arpa PTR OP TTL esp8266.local
-    PTR (0x0C, IP6):        eg. 90.0.0.0.0.0.0.0.0.0.0.0.78.56.34.12.ip6.arpa PTR OP TTL esp8266.local
+    PTR (0x0C, IP6):        eg. 90.0.0.0.0.0.0.0.0.0.0.0.78.56.34.12.ip6.arpa PTR OP TTL
-    SRV (0x21):             eg. MyESP._http._tcp.local SRV OP TTL PRIORITY WEIGHT PORT esp8266.local
+   esp8266.local SRV (0x21):             eg. MyESP._http._tcp.local SRV OP TTL PRIORITY WEIGHT PORT
-    TXT (0x10):             eg. MyESP._http._tcp.local TXT OP TTL c#=1
+   esp8266.local TXT (0x10):             eg. MyESP._http._tcp.local TXT OP TTL c#=1
 
     Some NOT used message types:
     OPT (0x29):             eDNS
@@ -111,10 +121,8 @@
 #include <PolledTimeout.h>
 #include <map>
 
-
 #include "ESP8266WiFi.h"
 
-
 namespace esp8266
 {
 
@@ -185,8 +193,10 @@ public:
         // Later call MDNS::update() in every 'loop' to run the process loop
         // (probing, announcing, responding, ...)
         // if interfaceAddress is not specified, default interface is STA, or AP when STA is not set
-    bool begin(const char* p_pcHostname, const IPAddress& p_IPAddress = INADDR_ANY, uint32_t p_u32TTL = 120 /*ignored*/);
+        bool begin(const char* p_pcHostname, const IPAddress& p_IPAddress = INADDR_ANY,
-    bool begin(const String& p_strHostname, const IPAddress& p_IPAddress = INADDR_ANY, uint32_t p_u32TTL = 120 /*ignored*/)
+                   uint32_t p_u32TTL = 120 /*ignored*/);
+        bool begin(const String& p_strHostname, const IPAddress& p_IPAddress = INADDR_ANY,
+                   uint32_t p_u32TTL = 120 /*ignored*/)
         {
             return begin(p_strHostname.c_str(), p_IPAddress, p_u32TTL);
         }
@@ -212,28 +222,22 @@ public:
         */
         typedef const void* hMDNSService;
 
-    // Add a new service to the MDNS responder. If no name (instance name) is given (p_pcName = 0)
+        // Add a new service to the MDNS responder. If no name (instance name) is given (p_pcName =
-    // the current hostname is used. If the hostname is changed later, the instance names for
+        // 0) the current hostname is used. If the hostname is changed later, the instance names for
         // these 'auto-named' services are changed to the new name also (and probing is restarted).
         // The usual '_' before p_pcService (eg. http) and protocol (eg. tcp) may be given.
-    hMDNSService addService(const char* p_pcName,
+        hMDNSService addService(const char* p_pcName, const char* p_pcService,
-                            const char* p_pcService,
+                                const char* p_pcProtocol, uint16_t p_u16Port);
-                            const char* p_pcProtocol,
-                            uint16_t p_u16Port);
         // Removes a service from the MDNS responder
         bool removeService(const hMDNSService p_hService);
-    bool removeService(const char* p_pcInstanceName,
+        bool removeService(const char* p_pcInstanceName, const char* p_pcServiceName,
-                       const char* p_pcServiceName,
                            const char* p_pcProtocol);
         // for compatibility...
-    bool addService(const String& p_strServiceName,
+        bool addService(const String& p_strServiceName, const String& p_strProtocol,
-                    const String& p_strProtocol,
                         uint16_t p_u16Port);
 
-
         // Change the services instance name (and restart probing).
-    bool setServiceName(const hMDNSService p_hService,
+        bool setServiceName(const hMDNSService p_hService, const char* p_pcInstanceName);
-                        const char* p_pcInstanceName);
         // for compatibility
         // Warning: this has the side effect of changing the hostname.
         // TODO: implement instancename different from hostname
@@ -253,53 +257,39 @@ public:
         typedef void* hMDNSTxt;
 
         // Add a (static) MDNS TXT item ('key' = 'value') to the service
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                const char* p_pcValue);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                uint32_t p_u32Value);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                uint16_t p_u16Value);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                uint8_t p_u8Value);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                int32_t p_i32Value);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                int16_t p_i16Value);
-    hMDNSTxt addServiceTxt(const hMDNSService p_hService,
+        hMDNSTxt addServiceTxt(const hMDNSService p_hService, const char* p_pcKey,
-                           const char* p_pcKey,
                                int8_t p_i8Value);
 
         // Remove an existing (static) MDNS TXT item from the service
-    bool removeServiceTxt(const hMDNSService p_hService,
+        bool removeServiceTxt(const hMDNSService p_hService, const hMDNSTxt p_hTxt);
-                          const hMDNSTxt p_hTxt);
+        bool removeServiceTxt(const hMDNSService p_hService, const char* p_pcKey);
-    bool removeServiceTxt(const hMDNSService p_hService,
+        bool removeServiceTxt(const char* p_pcinstanceName, const char* p_pcServiceName,
-                          const char* p_pcKey);
+                              const char* p_pcProtocol, const char* p_pcKey);
-    bool removeServiceTxt(const char* p_pcinstanceName,
-                          const char* p_pcServiceName,
-                          const char* p_pcProtocol,
-                          const char* p_pcKey);
         // for compatibility...
-    bool addServiceTxt(const char* p_pcService,
+        bool addServiceTxt(const char* p_pcService, const char* p_pcProtocol, const char* p_pcKey,
-                       const char* p_pcProtocol,
-                       const char* p_pcKey,
                            const char* p_pcValue);
-    bool addServiceTxt(const String& p_strService,
+        bool addServiceTxt(const String& p_strService, const String& p_strProtocol,
-                       const String& p_strProtocol,
+                           const String& p_strKey, const String& p_strValue);
-                       const String& p_strKey,
-                       const String& p_strValue);
 
         /**
             MDNSDynamicServiceTxtCallbackFn
             Callback function for dynamic MDNS TXT items
         */
 
-    typedef std::function<void(const hMDNSService p_hService)> MDNSDynamicServiceTxtCallbackFunc;
+        typedef std::function<void(const hMDNSService p_hService)>
+            MDNSDynamicServiceTxtCallbackFunc;
 
         // Set a global callback for dynamic MDNS TXT items. The callback function is called
         // every time, a TXT item is needed for one of the installed services.
@@ -312,26 +302,19 @@ public:
         // Add a (dynamic) MDNS TXT item ('key' = 'value') to the service
         // Dynamic TXT items are removed right after one-time use. So they need to be added
         // every time the value s needed (via callback).
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       const char* p_pcValue);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       uint32_t p_u32Value);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       uint16_t p_u16Value);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       uint8_t p_u8Value);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       int32_t p_i32Value);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       int16_t p_i16Value);
-    hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService,
+        hMDNSTxt addDynamicServiceTxt(hMDNSService p_hService, const char* p_pcKey,
-                                  const char* p_pcKey,
                                       int8_t p_i8Value);
 
         // Perform a (static) service query. The function returns after p_u16Timeout milliseconds
@@ -339,13 +322,11 @@ public:
         // - answerHostname (or hostname)
         // - answerIP (or IP)
         // - answerPort (or port)
-    uint32_t queryService(const char* p_pcService,
+        uint32_t queryService(const char* p_pcService, const char* p_pcProtocol,
-                          const char* p_pcProtocol,
                               const uint16_t p_u16Timeout = MDNS_QUERYSERVICES_WAIT_TIME);
         bool     removeQuery(void);
         // for compatibility...
-    uint32_t queryService(const String& p_strService,
+        uint32_t queryService(const String& p_strService, const String& p_strProtocol);
-                          const String& p_strProtocol);
 
         const char* answerHostname(const uint32_t p_u32AnswerIndex);
         IPAddress   answerIP(const uint32_t p_u32AnswerIndex);
@@ -395,10 +376,12 @@ public:
             Callback function for received answers for dynamic service queries
         */
         struct MDNSServiceInfo;  // forward declaration
-    typedef std::function<void(const MDNSServiceInfo& mdnsServiceInfo,
+        typedef std::function<void(
+            const MDNSServiceInfo& mdnsServiceInfo,
             AnswerType             answerType,  // flag for the updated answer item
             bool p_bSetContent  // true: Answer component set, false: component deleted
-                              )> MDNSServiceQueryCallbackFunc;
+            )>
+            MDNSServiceQueryCallbackFunc;
 
         // Install a dynamic service query. For every received answer (part) the given callback
         // function is called. The query will be updated every time, the TTL for an answer
@@ -411,14 +394,14 @@ public:
         // - hasAnswerIP6Address/answerIP6Address
         // - hasAnswerPort/answerPort
         // - hasAnswerTxts/answerTxts
-    hMDNSServiceQuery installServiceQuery(const char* p_pcService,
+        hMDNSServiceQuery installServiceQuery(const char* p_pcService, const char* p_pcProtocol,
-                                          const char* p_pcProtocol,
                                               MDNSServiceQueryCallbackFunc p_fnCallback);
         // Remove a dynamic service query
         bool removeServiceQuery(hMDNSServiceQuery p_hServiceQuery);
 
         uint32_t answerCount(const hMDNSServiceQuery p_hServiceQuery);
-    std::vector<MDNSResponder::MDNSServiceInfo> answerInfo(const MDNSResponder::hMDNSServiceQuery p_hServiceQuery);
+        std::vector<MDNSResponder::MDNSServiceInfo>
+        answerInfo(const MDNSResponder::hMDNSServiceQuery p_hServiceQuery);
 
         const char* answerServiceDomain(const hMDNSServiceQuery p_hServiceQuery,
                                         const uint32_t          p_u32AnswerIndex);
@@ -458,21 +441,20 @@ public:
             MDNSProbeResultCallbackFn
             Callback function for (host and service domain) probe results
         */
-    typedef std::function<void(const char* p_pcDomainName,
+        typedef std::function<void(const char* p_pcDomainName, bool p_bProbeResult)>
-                               bool p_bProbeResult)> MDNSHostProbeFn;
+            MDNSHostProbeFn;
 
-    typedef std::function<void(MDNSResponder& resp,
+        typedef std::function<void(MDNSResponder& resp, const char* p_pcDomainName,
-                               const char* p_pcDomainName,
+                                   bool p_bProbeResult)>
-                               bool p_bProbeResult)> MDNSHostProbeFn1;
+            MDNSHostProbeFn1;
 
-    typedef std::function<void(const char* p_pcServiceName,
+        typedef std::function<void(const char* p_pcServiceName, const hMDNSService p_hMDNSService,
-                               const hMDNSService p_hMDNSService,
+                                   bool p_bProbeResult)>
-                               bool p_bProbeResult)> MDNSServiceProbeFn;
+            MDNSServiceProbeFn;
 
-    typedef std::function<void(MDNSResponder& resp,
+        typedef std::function<void(MDNSResponder& resp, const char* p_pcServiceName,
-                               const char* p_pcServiceName,
+                                   const hMDNSService p_hMDNSService, bool p_bProbeResult)>
-                               const hMDNSService p_hMDNSService,
+            MDNSServiceProbeFn1;
-                               bool p_bProbeResult)> MDNSServiceProbeFn1;
 
         // Set a global callback function for host and service probe results
         // The callback function is called, when the probing for the host domain
@@ -499,12 +481,10 @@ public:
         bool announce(void);
 
         // Enable OTA update
-    hMDNSService enableArduino(uint16_t p_u16Port,
+        hMDNSService enableArduino(uint16_t p_u16Port, bool p_bAuthUpload = false);
-                               bool p_bAuthUpload = false);
 
         // Domain name helper
-    static bool indexDomain(char*& p_rpcDomain,
+        static bool indexDomain(char*& p_rpcDomain, const char* p_pcDivider = "-",
-                            const char* p_pcDivider = "-",
                                 const char* p_pcDefaultDomain = 0);
 
         /** STRUCTS **/
@@ -515,11 +495,10 @@ public:
         */
         struct MDNSServiceInfo
         {
-        MDNSServiceInfo(MDNSResponder& p_pM, MDNSResponder::hMDNSServiceQuery p_hS, uint32_t p_u32A)
+            MDNSServiceInfo(MDNSResponder& p_pM, MDNSResponder::hMDNSServiceQuery p_hS,
-            : p_pMDNSResponder(p_pM),
+                            uint32_t p_u32A) :
-              p_hServiceQuery(p_hS),
+                p_pMDNSResponder(p_pM),
-              p_u32AnswerIndex(p_u32A)
+                p_hServiceQuery(p_hS), p_u32AnswerIndex(p_u32A) {};
-        {};
             struct CompareKey
             {
                 bool operator()(char const* a, char const* b) const
@@ -528,11 +507,13 @@ public:
                 }
             };
             using KeyValueMap = std::map<const char*, const char*, CompareKey>;
+
         protected:
             MDNSResponder&                   p_pMDNSResponder;
             MDNSResponder::hMDNSServiceQuery p_hServiceQuery;
             uint32_t                         p_u32AnswerIndex;
             KeyValueMap                      keyValueMap;
+
         public:
             const char* serviceDomain()
             {
@@ -544,8 +525,9 @@ public:
             }
             const char* hostDomain()
             {
-            return (hostDomainAvailable()) ?
+                return (hostDomainAvailable())
-                   p_pMDNSResponder.answerHostDomain(p_hServiceQuery, p_u32AnswerIndex) : nullptr;
+                           ? p_pMDNSResponder.answerHostDomain(p_hServiceQuery, p_u32AnswerIndex)
+                           : nullptr;
             };
             bool hostPortAvailable()
             {
@@ -553,8 +535,9 @@ public:
             }
             uint16_t hostPort()
             {
-            return (hostPortAvailable()) ?
+                return (hostPortAvailable())
-                   p_pMDNSResponder.answerPort(p_hServiceQuery, p_u32AnswerIndex) : 0;
+                           ? p_pMDNSResponder.answerPort(p_hServiceQuery, p_u32AnswerIndex)
+                           : 0;
             };
             bool IP4AddressAvailable()
             {
@@ -565,10 +548,12 @@ public:
                 std::vector<IPAddress> internalIP;
                 if (IP4AddressAvailable())
                 {
-                uint16_t cntIP4Adress = p_pMDNSResponder.answerIP4AddressCount(p_hServiceQuery, p_u32AnswerIndex);
+                    uint16_t cntIP4Adress
+                        = p_pMDNSResponder.answerIP4AddressCount(p_hServiceQuery, p_u32AnswerIndex);
                     for (uint32_t u2 = 0; u2 < cntIP4Adress; ++u2)
                     {
-                    internalIP.emplace_back(p_pMDNSResponder.answerIP4Address(p_hServiceQuery, p_u32AnswerIndex, u2));
+                        internalIP.emplace_back(p_pMDNSResponder.answerIP4Address(
+                            p_hServiceQuery, p_u32AnswerIndex, u2));
                     }
                 }
                 return internalIP;
@@ -579,16 +564,20 @@ public:
             }
             const char* strKeyValue()
             {
-            return (txtAvailable()) ?
+                return (txtAvailable())
-                   p_pMDNSResponder.answerTxts(p_hServiceQuery, p_u32AnswerIndex) : nullptr;
+                           ? p_pMDNSResponder.answerTxts(p_hServiceQuery, p_u32AnswerIndex)
+                           : nullptr;
             };
             const KeyValueMap& keyValues()
             {
                 if (txtAvailable() && keyValueMap.size() == 0)
                 {
-                for (auto kv = p_pMDNSResponder._answerKeyValue(p_hServiceQuery, p_u32AnswerIndex); kv != nullptr; kv = kv->m_pNext)
+                    for (auto kv
+                         = p_pMDNSResponder._answerKeyValue(p_hServiceQuery, p_u32AnswerIndex);
+                         kv != nullptr; kv = kv->m_pNext)
                     {
-                    keyValueMap.emplace(std::pair<const char*, const char*>(kv->m_pcKey, kv->m_pcValue));
+                        keyValueMap.emplace(
+                            std::pair<const char*, const char*>(kv->m_pcKey, kv->m_pcValue));
                     }
                 }
                 return keyValueMap;
@@ -597,10 +586,11 @@ public:
             {
                 char* result = nullptr;
 
-            for (stcMDNSServiceTxt* pTxt = p_pMDNSResponder._answerKeyValue(p_hServiceQuery, p_u32AnswerIndex); pTxt; pTxt = pTxt->m_pNext)
+                for (stcMDNSServiceTxt* pTxt
+                     = p_pMDNSResponder._answerKeyValue(p_hServiceQuery, p_u32AnswerIndex);
+                     pTxt; pTxt = pTxt->m_pNext)
                 {
-                if ((key) &&
+                    if ((key) && (0 == strcmp(pTxt->m_pcKey, key)))
-                        (0 == strcmp(pTxt->m_pcKey, key)))
                     {
                         result = pTxt->m_pcValue;
                         break;
@@ -609,8 +599,8 @@ public:
                 return result;
             }
         };
-protected:
 
+    protected:
         /**
             stcMDNSServiceTxt
         */
@@ -621,8 +611,7 @@ protected:
             char*              m_pcValue;
             bool               m_bTemp;
 
-        stcMDNSServiceTxt(const char* p_pcKey = 0,
+            stcMDNSServiceTxt(const char* p_pcKey = 0, const char* p_pcValue = 0,
-                          const char* p_pcValue = 0,
                               bool p_bTemp = false);
             stcMDNSServiceTxt(const stcMDNSServiceTxt& p_Other);
             ~stcMDNSServiceTxt(void);
@@ -631,20 +620,16 @@ protected:
             bool               clear(void);
 
             char* allocKey(size_t p_stLength);
-        bool setKey(const char* p_pcKey,
+            bool  setKey(const char* p_pcKey, size_t p_stLength);
-                    size_t p_stLength);
             bool  setKey(const char* p_pcKey);
             bool  releaseKey(void);
 
             char* allocValue(size_t p_stLength);
-        bool setValue(const char* p_pcValue,
+            bool  setValue(const char* p_pcValue, size_t p_stLength);
-                      size_t p_stLength);
             bool  setValue(const char* p_pcValue);
             bool  releaseValue(void);
 
-        bool set(const char* p_pcKey,
+            bool set(const char* p_pcKey, const char* p_pcValue, bool p_bTemp = false);
-                 const char* p_pcValue,
-                 bool p_bTemp = false);
 
             bool update(const char* p_pcValue);
 
@@ -724,18 +709,11 @@ protected:
             uint16_t      m_u16NSCount;    // Authority Record count
             uint16_t      m_u16ARCount;    // Additional Record count
 
-        stcMDNS_MsgHeader(uint16_t p_u16ID = 0,
+            stcMDNS_MsgHeader(uint16_t p_u16ID = 0, bool p_bQR = false,
-                          bool p_bQR = false,
+                              unsigned char p_ucOpcode = 0, bool p_bAA = false, bool p_bTC = false,
-                          unsigned char p_ucOpcode = 0,
+                              bool p_bRD = false, bool p_bRA = false, unsigned char p_ucRCode = 0,
-                          bool p_bAA = false,
+                              uint16_t p_u16QDCount = 0, uint16_t p_u16ANCount = 0,
-                          bool p_bTC = false,
+                              uint16_t p_u16NSCount = 0, uint16_t p_u16ARCount = 0);
-                          bool p_bRD = false,
-                          bool p_bRA = false,
-                          unsigned char p_ucRCode = 0,
-                          uint16_t p_u16QDCount = 0,
-                          uint16_t p_u16ANCount = 0,
-                          uint16_t p_u16NSCount = 0,
-                          uint16_t p_u16ARCount = 0);
         };
 
         /**
@@ -753,8 +731,7 @@ protected:
 
             bool clear(void);
 
-        bool addLabel(const char* p_pcLabel,
+            bool addLabel(const char* p_pcLabel, bool p_bPrependUnderline = false);
-                      bool p_bPrependUnderline = false);
 
             bool compare(const stcMDNS_RRDomain& p_Other) const;
             bool operator==(const stcMDNS_RRDomain& p_Other) const;
@@ -839,8 +816,7 @@ protected:
             bool clear(void);
 
         protected:
-        stcMDNS_RRAnswer(enuAnswerType p_AnswerType,
+            stcMDNS_RRAnswer(enuAnswerType p_AnswerType, const stcMDNS_RRHeader& p_Header,
-                         const stcMDNS_RRHeader& p_Header,
                              uint32_t p_u32TTL);
         };
 
@@ -852,8 +828,7 @@ protected:
         {
             IPAddress m_IPAddress;
 
-        stcMDNS_RRAnswerA(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerA(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                          uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerA(void);
 
             bool clear(void);
@@ -867,8 +842,7 @@ protected:
         {
             stcMDNS_RRDomain m_PTRDomain;
 
-        stcMDNS_RRAnswerPTR(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerPTR(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                            uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerPTR(void);
 
             bool clear(void);
@@ -881,8 +855,7 @@ protected:
         {
             stcMDNSServiceTxts m_Txts;
 
-        stcMDNS_RRAnswerTXT(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerTXT(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                            uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerTXT(void);
 
             bool clear(void);
@@ -896,8 +869,7 @@ protected:
         {
             // TODO: IP6Address          m_IPAddress;
 
-        stcMDNS_RRAnswerAAAA(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerAAAA(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                             uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerAAAA(void);
 
             bool clear(void);
@@ -914,8 +886,7 @@ protected:
             uint16_t         m_u16Port;
             stcMDNS_RRDomain m_SRVDomain;
 
-        stcMDNS_RRAnswerSRV(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerSRV(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                            uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerSRV(void);
 
             bool clear(void);
@@ -929,14 +900,12 @@ protected:
             uint16_t m_u16RDLength;  // Length of variable answer
             uint8_t* m_pu8RDData;    // Offset of start of variable answer in packet
 
-        stcMDNS_RRAnswerGeneric(const stcMDNS_RRHeader& p_Header,
+            stcMDNS_RRAnswerGeneric(const stcMDNS_RRHeader& p_Header, uint32_t p_u32TTL);
-                                uint32_t p_u32TTL);
             ~stcMDNS_RRAnswerGeneric(void);
 
             bool clear(void);
         };
 
-
         /**
             enuProbingStatus
         */
@@ -956,7 +925,8 @@ protected:
             enuProbingStatus                  m_ProbingStatus;
             uint8_t                           m_u8SentCount;  // Used for probes and announcements
             esp8266::polledTimeout::oneShotMs m_Timeout;      // Used for probes and announcements
-        //clsMDNSTimeFlag                   m_TimeFlag;     // Used for probes and announcements
+            // clsMDNSTimeFlag                   m_TimeFlag;     // Used for probes and
+            // announcements
             bool               m_bConflict;
             bool               m_bTiebreakNeeded;
             MDNSHostProbeFn    m_fnHostProbeResultCallback;
@@ -967,7 +937,6 @@ protected:
             bool clear(bool p_bClearUserdata = false);
         };
 
-
         /**
             stcMDNSService
         */
@@ -984,8 +953,7 @@ protected:
             MDNSDynamicServiceTxtCallbackFunc m_fnTxtCallback;
             stcProbeInformation               m_ProbeInformation;
 
-        stcMDNSService(const char* p_pcName = 0,
+            stcMDNSService(const char* p_pcName = 0, const char* p_pcService = 0,
-                       const char* p_pcService = 0,
                            const char* p_pcProtocol = 0);
             ~stcMDNSService(void);
 
@@ -1053,8 +1021,7 @@ protected:
                     IPAddress      m_IPAddress;
                     stcTTL         m_TTL;
 
-                stcIP4Address(IPAddress p_IPAddress,
+                    stcIP4Address(IPAddress p_IPAddress, uint32_t p_u32TTL = 0);
-                              uint32_t p_u32TTL = 0);
                 };
 #endif
 #ifdef MDNS_IP6_SUPPORT
@@ -1067,18 +1034,19 @@ protected:
                     IP6Address     m_IPAddress;
                     stcTTL         m_TTL;
 
-                stcIP6Address(IPAddress p_IPAddress,
+                    stcIP6Address(IPAddress p_IPAddress, uint32_t p_u32TTL = 0);
-                              uint32_t p_u32TTL = 0);
                 };
 #endif
 
                 stcAnswer* m_pNext;
-            // The service domain is the first 'answer' (from PTR answer, using service and protocol) to be set
+                // The service domain is the first 'answer' (from PTR answer, using service and
-            // Defines the key for additional answer, like host domain, etc.
+                // protocol) to be set Defines the key for additional answer, like host domain, etc.
-            stcMDNS_RRDomain    m_ServiceDomain;    // 1. level answer (PTR), eg. MyESP._http._tcp.local
+                stcMDNS_RRDomain
+                       m_ServiceDomain;  // 1. level answer (PTR), eg. MyESP._http._tcp.local
                 char*  m_pcServiceDomain;
                 stcTTL m_TTLServiceDomain;
-            stcMDNS_RRDomain    m_HostDomain;       // 2. level answer (SRV, using service domain), eg. esp8266.local
+                stcMDNS_RRDomain
+                    m_HostDomain;  // 2. level answer (SRV, using service domain), eg. esp8266.local
                 char*    m_pcHostDomain;
                 uint16_t m_u16Port;  // 2. level answer (SRV, using service domain), eg. 5000
                 stcTTL   m_TTLHostDomainAndPort;
@@ -1086,10 +1054,12 @@ protected:
                 char*              m_pcTxts;
                 stcTTL             m_TTLTxts;
 #ifdef MDNS_IP4_SUPPORT
-            stcIP4Address*      m_pIP4Addresses;    // 3. level answer (A, using host domain), eg. 123.456.789.012
+                stcIP4Address*
+                    m_pIP4Addresses;  // 3. level answer (A, using host domain), eg. 123.456.789.012
 #endif
 #ifdef MDNS_IP6_SUPPORT
-            stcIP6Address*      m_pIP6Addresses;    // 3. level answer (AAAA, using host domain), eg. 1234::09
+                stcIP6Address*
+                    m_pIP6Addresses;  // 3. level answer (AAAA, using host domain), eg. 1234::09
 #endif
                 uint32_t m_u32ContentFlags;
 
@@ -1171,8 +1141,7 @@ protected:
                 bool m_bAdditionalData;  // Opaque flag for special info (service domain included)
                 uint16_t m_u16Offset;    // Offset in UDP output buffer
 
-            stcDomainCacheItem(const void* p_pHostnameOrService,
+                stcDomainCacheItem(const void* p_pHostnameOrService, bool p_bAdditionalData,
-                               bool p_bAdditionalData,
                                    uint32_t p_u16Offset);
             };
 
@@ -1197,8 +1166,7 @@ protected:
 
             bool shiftOffset(uint16_t p_u16Shift);
 
-        bool addDomainCacheItem(const void* p_pHostnameOrService,
+            bool     addDomainCacheItem(const void* p_pHostnameOrService, bool p_bAdditionalData,
-                                bool p_bAdditionalData,
                                         uint16_t p_u16Offset);
             uint16_t findCachedDomainOffset(const void* p_pHostnameOrService,
                                             bool        p_bAdditionalData) const;
@@ -1245,10 +1213,8 @@ protected:
         bool _cancelProbingForService(stcMDNSService& p_rService);
 
         /* ANNOUNCE */
-    bool _announce(bool p_bAnnounce,
+        bool _announce(bool p_bAnnounce, bool p_bIncludeServices);
-                   bool p_bIncludeServices);
+        bool _announceService(stcMDNSService& p_rService, bool p_bAnnounce = true);
-    bool _announceService(stcMDNSService& p_rService,
-                          bool p_bAnnounce = true);
 
         /* SERVICE QUERY CACHE */
         bool _hasServiceQueriesWaitingForAnswers(void) const;
@@ -1258,11 +1224,9 @@ protected:
         /* SENDING */
         bool _sendMDNSMessage(stcMDNSSendParameter& p_SendParameter);
         bool _sendMDNSMessage_Multicast(MDNSResponder::stcMDNSSendParameter& p_rSendParameter);
-    bool _prepareMDNSMessage(stcMDNSSendParameter& p_SendParameter,
+        bool _prepareMDNSMessage(stcMDNSSendParameter& p_SendParameter, IPAddress p_IPAddress);
-                             IPAddress p_IPAddress);
         bool _sendMDNSServiceQuery(const stcMDNSServiceQuery& p_ServiceQuery);
-    bool _sendMDNSQuery(const stcMDNS_RRDomain& p_QueryDomain,
+        bool _sendMDNSQuery(const stcMDNS_RRDomain& p_QueryDomain, uint16_t p_u16QueryType,
-                        uint16_t p_u16QueryType,
                             stcMDNSServiceQuery::stcAnswer* p_pKnownAnswers = 0);
 
         uint8_t _replyMaskForHost(const stcMDNS_RRHeader& p_RRHeader,
@@ -1275,37 +1239,28 @@ protected:
         bool _readRRQuestion(stcMDNS_RRQuestion& p_rQuestion);
         bool _readRRAnswer(stcMDNS_RRAnswer*& p_rpAnswer);
 #ifdef MDNS_IP4_SUPPORT
-    bool _readRRAnswerA(stcMDNS_RRAnswerA& p_rRRAnswerA,
+        bool _readRRAnswerA(stcMDNS_RRAnswerA& p_rRRAnswerA, uint16_t p_u16RDLength);
-                        uint16_t p_u16RDLength);
 #endif
-    bool _readRRAnswerPTR(stcMDNS_RRAnswerPTR& p_rRRAnswerPTR,
+        bool _readRRAnswerPTR(stcMDNS_RRAnswerPTR& p_rRRAnswerPTR, uint16_t p_u16RDLength);
-                          uint16_t p_u16RDLength);
+        bool _readRRAnswerTXT(stcMDNS_RRAnswerTXT& p_rRRAnswerTXT, uint16_t p_u16RDLength);
-    bool _readRRAnswerTXT(stcMDNS_RRAnswerTXT& p_rRRAnswerTXT,
-                          uint16_t p_u16RDLength);
 #ifdef MDNS_IP6_SUPPORT
-    bool _readRRAnswerAAAA(stcMDNS_RRAnswerAAAA& p_rRRAnswerAAAA,
+        bool _readRRAnswerAAAA(stcMDNS_RRAnswerAAAA& p_rRRAnswerAAAA, uint16_t p_u16RDLength);
-                           uint16_t p_u16RDLength);
 #endif
-    bool _readRRAnswerSRV(stcMDNS_RRAnswerSRV& p_rRRAnswerSRV,
+        bool _readRRAnswerSRV(stcMDNS_RRAnswerSRV& p_rRRAnswerSRV, uint16_t p_u16RDLength);
-                          uint16_t p_u16RDLength);
         bool _readRRAnswerGeneric(stcMDNS_RRAnswerGeneric& p_rRRAnswerGeneric,
                                   uint16_t                 p_u16RDLength);
 
         bool _readRRHeader(stcMDNS_RRHeader& p_rHeader);
         bool _readRRDomain(stcMDNS_RRDomain& p_rRRDomain);
-    bool _readRRDomain_Loop(stcMDNS_RRDomain& p_rRRDomain,
+        bool _readRRDomain_Loop(stcMDNS_RRDomain& p_rRRDomain, uint8_t p_u8Depth);
-                            uint8_t p_u8Depth);
         bool _readRRAttributes(stcMDNS_RRAttributes& p_rAttributes);
 
         /* DOMAIN NAMES */
-    bool _buildDomainForHost(const char* p_pcHostname,
+        bool _buildDomainForHost(const char* p_pcHostname, stcMDNS_RRDomain& p_rHostDomain) const;
-                             stcMDNS_RRDomain& p_rHostDomain) const;
         bool _buildDomainForDNSSD(stcMDNS_RRDomain& p_rDNSSDDomain) const;
-    bool _buildDomainForService(const stcMDNSService& p_Service,
+        bool _buildDomainForService(const stcMDNSService& p_Service, bool p_bIncludeName,
-                                bool p_bIncludeName,
                                     stcMDNS_RRDomain& p_rServiceDomain) const;
-    bool _buildDomainForService(const char* p_pcService,
+        bool _buildDomainForService(const char* p_pcService, const char* p_pcProtocol,
-                                const char* p_pcProtocol,
                                     stcMDNS_RRDomain& p_rServiceDomain) const;
 #ifdef MDNS_IP4_SUPPORT
         bool _buildDomainForReverseIP4(IPAddress         p_IP4Address,
@@ -1317,33 +1272,27 @@ protected:
 #endif
 
         /* UDP */
-    bool _udpReadBuffer(unsigned char* p_pBuffer,
+        bool _udpReadBuffer(unsigned char* p_pBuffer, size_t p_stLength);
-                        size_t p_stLength);
         bool _udpRead8(uint8_t& p_ru8Value);
         bool _udpRead16(uint16_t& p_ru16Value);
         bool _udpRead32(uint32_t& p_ru32Value);
 
-    bool _udpAppendBuffer(const unsigned char* p_pcBuffer,
+        bool _udpAppendBuffer(const unsigned char* p_pcBuffer, size_t p_stLength);
-                          size_t p_stLength);
         bool _udpAppend8(uint8_t p_u8Value);
         bool _udpAppend16(uint16_t p_u16Value);
         bool _udpAppend32(uint32_t p_u32Value);
 
 #if not defined ESP_8266_MDNS_INCLUDE || defined DEBUG_ESP_MDNS_RESPONDER
         bool _udpDump(bool p_bMovePointer = false);
-    bool _udpDump(unsigned p_uOffset,
+        bool _udpDump(unsigned p_uOffset, unsigned p_uLength);
-                  unsigned p_uLength);
 #endif
 
         /* READ/WRITE MDNS STRUCTS */
         bool _readMDNSMsgHeader(stcMDNS_MsgHeader& p_rMsgHeader);
 
-    bool _write8(uint8_t p_u8Value,
+        bool _write8(uint8_t p_u8Value, stcMDNSSendParameter& p_rSendParameter);
-                 stcMDNSSendParameter& p_rSendParameter);
+        bool _write16(uint16_t p_u16Value, stcMDNSSendParameter& p_rSendParameter);
-    bool _write16(uint16_t p_u16Value,
+        bool _write32(uint32_t p_u32Value, stcMDNSSendParameter& p_rSendParameter);
-                  stcMDNSSendParameter& p_rSendParameter);
-    bool _write32(uint32_t p_u32Value,
-                  stcMDNSSendParameter& p_rSendParameter);
 
         bool _writeMDNSMsgHeader(const stcMDNS_MsgHeader& p_MsgHeader,
                                  stcMDNSSendParameter&    p_rSendParameter);
@@ -1351,11 +1300,9 @@ protected:
                                     stcMDNSSendParameter&       p_rSendParameter);
         bool _writeMDNSRRDomain(const stcMDNS_RRDomain& p_Domain,
                                 stcMDNSSendParameter&   p_rSendParameter);
-    bool _writeMDNSHostDomain(const char* m_pcHostname,
+        bool _writeMDNSHostDomain(const char* m_pcHostname, bool p_bPrependRDLength,
-                              bool p_bPrependRDLength,
                                   stcMDNSSendParameter& p_rSendParameter);
-    bool _writeMDNSServiceDomain(const stcMDNSService& p_Service,
+        bool _writeMDNSServiceDomain(const stcMDNSService& p_Service, bool p_bIncludeName,
-                                 bool p_bIncludeName,
                                      bool                  p_bPrependRDLength,
                                      stcMDNSSendParameter& p_rSendParameter);
 
@@ -1363,8 +1310,7 @@ protected:
                                 stcMDNSSendParameter& p_rSendParameter);
 
 #ifdef MDNS_IP4_SUPPORT
-    bool _writeMDNSAnswer_A(IPAddress p_IPAddress,
+        bool _writeMDNSAnswer_A(IPAddress p_IPAddress, stcMDNSSendParameter& p_rSendParameter);
-                            stcMDNSSendParameter& p_rSendParameter);
         bool _writeMDNSAnswer_PTR_IP4(IPAddress             p_IPAddress,
                                       stcMDNSSendParameter& p_rSendParameter);
 #endif
@@ -1375,8 +1321,7 @@ protected:
         bool _writeMDNSAnswer_TXT(stcMDNSService&       p_rService,
                                   stcMDNSSendParameter& p_rSendParameter);
 #ifdef MDNS_IP6_SUPPORT
-    bool _writeMDNSAnswer_AAAA(IPAddress p_IPAddress,
+        bool _writeMDNSAnswer_AAAA(IPAddress p_IPAddress, stcMDNSSendParameter& p_rSendParameter);
-                               stcMDNSSendParameter& p_rSendParameter);
         bool _writeMDNSAnswer_PTR_IP6(IPAddress             p_IPAddress,
                                       stcMDNSSendParameter& p_rSendParameter);
 #endif
@@ -1396,7 +1341,8 @@ protected:
         stcMDNSServiceQuery* _findServiceQuery(hMDNSServiceQuery p_hServiceQuery);
         stcMDNSServiceQuery* _findLegacyServiceQuery(void);
         bool                 _releaseServiceQueries(void);
-    stcMDNSServiceQuery* _findNextServiceQueryByServiceType(const stcMDNS_RRDomain& p_ServiceDomain,
+        stcMDNSServiceQuery*
+        _findNextServiceQueryByServiceType(const stcMDNS_RRDomain&    p_ServiceDomain,
                                            const stcMDNSServiceQuery* p_pPrevServiceQuery);
 
         /* HOSTNAME */
@@ -1404,49 +1350,36 @@ protected:
         bool _releaseHostname(void);
 
         /* SERVICE */
-    stcMDNSService* _allocService(const char* p_pcName,
+        stcMDNSService* _allocService(const char* p_pcName, const char* p_pcService,
-                                  const char* p_pcService,
+                                      const char* p_pcProtocol, uint16_t p_u16Port);
-                                  const char* p_pcProtocol,
-                                  uint16_t p_u16Port);
         bool            _releaseService(stcMDNSService* p_pService);
         bool            _releaseServices(void);
 
-    stcMDNSService* _findService(const char* p_pcName,
+        stcMDNSService* _findService(const char* p_pcName, const char* p_pcService,
-                                 const char* p_pcService,
                                      const char* p_pcProtocol);
         stcMDNSService* _findService(const hMDNSService p_hService);
 
         size_t _countServices(void) const;
 
         /* SERVICE TXT */
-    stcMDNSServiceTxt* _allocServiceTxt(stcMDNSService* p_pService,
+        stcMDNSServiceTxt* _allocServiceTxt(stcMDNSService* p_pService, const char* p_pcKey,
-                                        const char* p_pcKey,
+                                            const char* p_pcValue, bool p_bTemp);
-                                        const char* p_pcValue,
+        bool _releaseServiceTxt(stcMDNSService* p_pService, stcMDNSServiceTxt* p_pTxt);
-                                        bool p_bTemp);
+        stcMDNSServiceTxt* _updateServiceTxt(stcMDNSService* p_pService, stcMDNSServiceTxt* p_pTxt,
-    bool _releaseServiceTxt(stcMDNSService* p_pService,
+                                             const char* p_pcValue, bool p_bTemp);
-                            stcMDNSServiceTxt* p_pTxt);
-    stcMDNSServiceTxt* _updateServiceTxt(stcMDNSService* p_pService,
-                                         stcMDNSServiceTxt* p_pTxt,
-                                         const char* p_pcValue,
-                                         bool p_bTemp);
 
-    stcMDNSServiceTxt* _findServiceTxt(stcMDNSService* p_pService,
+        stcMDNSServiceTxt* _findServiceTxt(stcMDNSService* p_pService, const char* p_pcKey);
-                                       const char* p_pcKey);
+        stcMDNSServiceTxt* _findServiceTxt(stcMDNSService* p_pService, const hMDNSTxt p_hTxt);
-    stcMDNSServiceTxt* _findServiceTxt(stcMDNSService* p_pService,
-                                       const hMDNSTxt p_hTxt);
 
-    stcMDNSServiceTxt* _addServiceTxt(stcMDNSService* p_pService,
+        stcMDNSServiceTxt* _addServiceTxt(stcMDNSService* p_pService, const char* p_pcKey,
-                                      const char* p_pcKey,
+                                          const char* p_pcValue, bool p_bTemp);
-                                      const char* p_pcValue,
-                                      bool p_bTemp);
 
         stcMDNSServiceTxt* _answerKeyValue(const hMDNSServiceQuery p_hServiceQuery,
                                            const uint32_t          p_u32AnswerIndex);
 
         bool                     _collectServiceTxts(stcMDNSService& p_rService);
         bool                     _releaseTempServiceTxts(stcMDNSService& p_rService);
-    const stcMDNSServiceTxt* _serviceTxts(const char* p_pcName,
+        const stcMDNSServiceTxt* _serviceTxts(const char* p_pcName, const char* p_pcService,
-                                          const char* p_pcService,
                                               const char* p_pcProtocol);
 
         /* MISC */

libraries/ESP8266mDNS/src/LEAmDNS_Helpers.cpp

@@ -58,7 +58,6 @@ namespace MDNSImplementation
                                                const char* p_pcDivider /*= "-"*/,
                                                const char* p_pcDefaultDomain /*= 0*/)
     {
-
         bool bResult = false;
 
         // Ensure a divider exists; use '-' as default
@@ -71,18 +70,18 @@ namespace MDNSImplementation
             {
                 char*         pEnd    = 0;
                 unsigned long ulIndex = strtoul((pFoundDivider + strlen(pcDivider)), &pEnd, 10);
-            if ((ulIndex) &&
+                if ((ulIndex) && ((pEnd - p_rpcDomain) == (ptrdiff_t)strlen(p_rpcDomain))
-                    ((pEnd - p_rpcDomain) == (ptrdiff_t)strlen(p_rpcDomain)) &&
+                    && (!*pEnd))  // Valid (old) index found
-                    (!*pEnd))         // Valid (old) index found
                 {
-
                     char acIndexBuffer[16];
                     sprintf(acIndexBuffer, "%lu", (++ulIndex));
-                size_t  stLength = ((pFoundDivider - p_rpcDomain + strlen(pcDivider)) + strlen(acIndexBuffer) + 1);
+                    size_t stLength     = ((pFoundDivider - p_rpcDomain + strlen(pcDivider))
+                                       + strlen(acIndexBuffer) + 1);
                     char*  pNewHostname = new char[stLength];
                     if (pNewHostname)
                     {
-                    memcpy(pNewHostname, p_rpcDomain, (pFoundDivider - p_rpcDomain + strlen(pcDivider)));
+                        memcpy(pNewHostname, p_rpcDomain,
+                               (pFoundDivider - p_rpcDomain + strlen(pcDivider)));
                         pNewHostname[pFoundDivider - p_rpcDomain + strlen(pcDivider)] = 0;
                         strcat(pNewHostname, acIndexBuffer);
 
@@ -93,7 +92,8 @@ namespace MDNSImplementation
                     }
                     else
                     {
-                    DEBUG_EX_ERR(DEBUG_OUTPUT.println(F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
+                        DEBUG_EX_ERR(DEBUG_OUTPUT.println(
+                            F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
                     }
                 }
                 else
@@ -102,9 +102,11 @@ namespace MDNSImplementation
                 }
             }
 
-        if (!pFoundDivider)     // not yet extended (or failed to increment extension) -> start indexing
+            if (!pFoundDivider)  // not yet extended (or failed to increment extension) -> start
+                                 // indexing
             {
-            size_t    stLength = strlen(p_rpcDomain) + (strlen(pcDivider) + 1 + 1);   // Name + Divider + '2' + '\0'
+                size_t stLength = strlen(p_rpcDomain)
+                                  + (strlen(pcDivider) + 1 + 1);  // Name + Divider + '2' + '\0'
                 char* pNewHostname = new char[stLength];
                 if (pNewHostname)
                 {
@@ -117,7 +119,8 @@ namespace MDNSImplementation
                 }
                 else
                 {
-                DEBUG_EX_ERR(DEBUG_OUTPUT.println(F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
+                    DEBUG_EX_ERR(DEBUG_OUTPUT.println(
+                        F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
                 }
             }
         }
@@ -135,21 +138,24 @@ namespace MDNSImplementation
             }
             else
             {
-            DEBUG_EX_ERR(DEBUG_OUTPUT.println(F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
+                DEBUG_EX_ERR(DEBUG_OUTPUT.println(
+                    F("[MDNSResponder] indexDomain: FAILED to alloc new hostname!")););
             }
         }
-    DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] indexDomain: %s\n"), p_rpcDomain););
+        DEBUG_EX_INFO(
+            DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] indexDomain: %s\n"), p_rpcDomain););
         return bResult;
     }
 
-
     /*
         UDP CONTEXT
     */
 
     bool MDNSResponder::_callProcess(void)
     {
-    DEBUG_EX_INFO(DEBUG_OUTPUT.printf("[MDNSResponder] _callProcess (%lu, triggered by: %s)\n", millis(), IPAddress(m_pUDPContext->getRemoteAddress()).toString().c_str()););
+        DEBUG_EX_INFO(
+            DEBUG_OUTPUT.printf("[MDNSResponder] _callProcess (%lu, triggered by: %s)\n", millis(),
+                                IPAddress(m_pUDPContext->getRemoteAddress()).toString().c_str()););
 
         return _process(false);
     }
@@ -192,7 +198,6 @@ bool MDNSResponder::_allocUDPContext(void)
     */
     bool MDNSResponder::_releaseUDPContext(void)
     {
-
         if (m_pUDPContext)
         {
             m_pUDPContext->unref();
@@ -202,7 +207,6 @@ bool MDNSResponder::_releaseUDPContext(void)
         return true;
     }
 
-
     /*
         SERVICE QUERY
     */
@@ -212,7 +216,6 @@ bool MDNSResponder::_releaseUDPContext(void)
     */
     MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_allocServiceQuery(void)
     {
-
         stcMDNSServiceQuery* pServiceQuery = new stcMDNSServiceQuery;
         if (pServiceQuery)
         {
@@ -228,14 +231,12 @@ MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_allocServiceQuery(void)
     */
     bool MDNSResponder::_removeServiceQuery(MDNSResponder::stcMDNSServiceQuery* p_pServiceQuery)
     {
-
         bool bResult = false;
 
         if (p_pServiceQuery)
         {
             stcMDNSServiceQuery* pPred = m_pServiceQueries;
-        while ((pPred) &&
+            while ((pPred) && (pPred->m_pNext != p_pServiceQuery))
-                (pPred->m_pNext != p_pServiceQuery))
             {
                 pPred = pPred->m_pNext;
             }
@@ -255,7 +256,8 @@ bool MDNSResponder::_removeServiceQuery(MDNSResponder::stcMDNSServiceQuery* p_pS
                 }
                 else
                 {
-                DEBUG_EX_ERR(DEBUG_OUTPUT.println("[MDNSResponder] _releaseServiceQuery: INVALID service query!"););
+                    DEBUG_EX_ERR(DEBUG_OUTPUT.println(
+                        "[MDNSResponder] _releaseServiceQuery: INVALID service query!"););
                 }
             }
         }
@@ -267,7 +269,6 @@ bool MDNSResponder::_removeServiceQuery(MDNSResponder::stcMDNSServiceQuery* p_pS
     */
     bool MDNSResponder::_removeLegacyServiceQuery(void)
     {
-
         stcMDNSServiceQuery* pLegacyServiceQuery = _findLegacyServiceQuery();
         return (pLegacyServiceQuery ? _removeServiceQuery(pLegacyServiceQuery) : true);
     }
@@ -278,9 +279,9 @@ bool MDNSResponder::_removeLegacyServiceQuery(void)
         'Convert' hMDNSServiceQuery to stcMDNSServiceQuery* (ensure existence)
 
     */
-MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findServiceQuery(MDNSResponder::hMDNSServiceQuery p_hServiceQuery)
+    MDNSResponder::stcMDNSServiceQuery*
+    MDNSResponder::_findServiceQuery(MDNSResponder::hMDNSServiceQuery p_hServiceQuery)
     {
-
         stcMDNSServiceQuery* pServiceQuery = m_pServiceQueries;
         while (pServiceQuery)
         {
@@ -298,7 +299,6 @@ MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findServiceQuery(MDNSRespond
     */
     MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findLegacyServiceQuery(void)
     {
-
         stcMDNSServiceQuery* pServiceQuery = m_pServiceQueries;
         while (pServiceQuery)
         {
@@ -328,12 +328,13 @@ bool MDNSResponder::_releaseServiceQueries(void)
     /*
         MDNSResponder::_findNextServiceQueryByServiceType
     */
-MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findNextServiceQueryByServiceType(const stcMDNS_RRDomain& p_ServiceTypeDomain,
+    MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findNextServiceQueryByServiceType(
-        const stcMDNSServiceQuery* p_pPrevServiceQuery)
+        const stcMDNS_RRDomain& p_ServiceTypeDomain, const stcMDNSServiceQuery* p_pPrevServiceQuery)
     {
         stcMDNSServiceQuery* pMatchingServiceQuery = 0;
 
-    stcMDNSServiceQuery*    pServiceQuery = (p_pPrevServiceQuery ? p_pPrevServiceQuery->m_pNext : m_pServiceQueries);
+        stcMDNSServiceQuery* pServiceQuery
+            = (p_pPrevServiceQuery ? p_pPrevServiceQuery->m_pNext : m_pServiceQueries);
         while (pServiceQuery)
         {
             if (p_ServiceTypeDomain == pServiceQuery->m_ServiceTypeDomain)
@@ -346,7 +347,6 @@ MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findNextServiceQueryByServic
         return pMatchingServiceQuery;
     }
 
-
     /*
         HOSTNAME
     */
@@ -356,15 +356,17 @@ MDNSResponder::stcMDNSServiceQuery* MDNSResponder::_findNextServiceQueryByServic
     */
     bool MDNSResponder::_setHostname(const char* p_pcHostname)
     {
-    //DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _allocHostname (%s)\n"), p_pcHostname););
+        // DEBUG_EX_INFO(DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] _allocHostname (%s)\n"),
+        // p_pcHostname););
 
         bool bResult = false;
 
         _releaseHostname();
 
         size_t stLength = 0;
-    if ((p_pcHostname) &&
+        if ((p_pcHostname)
-            (MDNS_DOMAIN_LABEL_MAXLENGTH >= (stLength = strlen(p_pcHostname))))   // char max size for a single label
+            && (MDNS_DOMAIN_LABEL_MAXLENGTH
+                >= (stLength = strlen(p_pcHostname))))  // char max size for a single label
         {
             // Copy in hostname characters as lowercase
             if ((bResult = (0 != (m_pcHostname = new char[stLength + 1]))))
@@ -373,7 +375,8 @@ bool MDNSResponder::_setHostname(const char* p_pcHostname)
                 size_t i = 0;
                 for (; i < stLength; ++i)
                 {
-                m_pcHostname[i] = (isupper(p_pcHostname[i]) ? tolower(p_pcHostname[i]) : p_pcHostname[i]);
+                    m_pcHostname[i]
+                        = (isupper(p_pcHostname[i]) ? tolower(p_pcHostname[i]) : p_pcHostname[i]);
                 }
                 m_pcHostname[i] = 0;
 #else
@@ -389,7 +392,6 @@ bool MDNSResponder::_setHostname(const char* p_pcHostname)
     */
     bool MDNSResponder::_releaseHostname(void)
     {
-
         if (m_pcHostname)
         {
             delete[] m_pcHostname;
@@ -398,7 +400,6 @@ bool MDNSResponder::_releaseHostname(void)
         return true;
     }
 
-
     /*
         SERVICE
     */
@@ -411,21 +412,14 @@ MDNSResponder::stcMDNSService* MDNSResponder::_allocService(const char* p_pcName
                                                                 const char* p_pcProtocol,
                                                                 uint16_t    p_u16Port)
     {
-
         stcMDNSService* pService = 0;
-    if (((!p_pcName) ||
+        if (((!p_pcName) || (MDNS_DOMAIN_LABEL_MAXLENGTH >= strlen(p_pcName))) && (p_pcService)
-            (MDNS_DOMAIN_LABEL_MAXLENGTH >= strlen(p_pcName))) &&
+            && (MDNS_SERVICE_NAME_LENGTH >= strlen(p_pcService)) && (p_pcProtocol)
-            (p_pcService) &&
+            && (MDNS_SERVICE_PROTOCOL_LENGTH >= strlen(p_pcProtocol)) && (p_u16Port)
-            (MDNS_SERVICE_NAME_LENGTH >= strlen(p_pcService)) &&
+            && (0 != (pService = new stcMDNSService))
-            (p_pcProtocol) &&
+            && (pService->setName(p_pcName ?: m_pcHostname)) && (pService->setService(p_pcService))
-            (MDNS_SERVICE_PROTOCOL_LENGTH >= strlen(p_pcProtocol)) &&
+            && (pService->setProtocol(p_pcProtocol)))
-            (p_u16Port) &&
-            (0 != (pService = new stcMDNSService)) &&
-            (pService->setName(p_pcName ? : m_pcHostname)) &&
-            (pService->setService(p_pcService)) &&
-            (pService->setProtocol(p_pcProtocol)))
         {
-
             pService->m_bAutoName = (0 == p_pcName);
             pService->m_u16Port   = p_u16Port;
 
@@ -441,14 +435,12 @@ MDNSResponder::stcMDNSService* MDNSResponder::_allocService(const char* p_pcName
     */
     bool MDNSResponder::_releaseService(MDNSResponder::stcMDNSService* p_pService)
     {
-
         bool bResult = false;
 
         if (p_pService)
         {
             stcMDNSService* pPred = m_pServices;
-        while ((pPred) &&
+            while ((pPred) && (pPred->m_pNext != p_pService))
-                (pPred->m_pNext != p_pService))
             {
                 pPred = pPred->m_pNext;
             }
@@ -468,7 +460,8 @@ bool MDNSResponder::_releaseService(MDNSResponder::stcMDNSService* p_pService)
                 }
                 else
                 {
-                DEBUG_EX_ERR(DEBUG_OUTPUT.println("[MDNSResponder] _releaseService: INVALID service!"););
+                    DEBUG_EX_ERR(
+                        DEBUG_OUTPUT.println("[MDNSResponder] _releaseService: INVALID service!"););
                 }
             }
         }
@@ -480,7 +473,6 @@ bool MDNSResponder::_releaseService(MDNSResponder::stcMDNSService* p_pService)
     */
     bool MDNSResponder::_releaseServices(void)
     {
-
         stcMDNSService* pService = m_pServices;
         while (pService)
         {
@@ -497,15 +489,13 @@ MDNSResponder::stcMDNSService* MDNSResponder::_findService(const char* p_pcName,
                                                                const char* p_pcService,
                                                                const char* p_pcProtocol)
     {
-
         stcMDNSService* pService = m_pServices;
         while (pService)
         {
-        if ((0 == strcmp(pService->m_pcName, p_pcName)) &&
+            if ((0 == strcmp(pService->m_pcName, p_pcName))
-                (0 == strcmp(pService->m_pcService, p_pcService)) &&
+                && (0 == strcmp(pService->m_pcService, p_pcService))
-                (0 == strcmp(pService->m_pcProtocol, p_pcProtocol)))
+                && (0 == strcmp(pService->m_pcProtocol, p_pcProtocol)))
             {
-
                 break;
             }
             pService = pService->m_pNext;
@@ -516,9 +506,9 @@ MDNSResponder::stcMDNSService* MDNSResponder::_findService(const char* p_pcName,
     /*
         MDNSResponder::_findService
     */
-MDNSResponder::stcMDNSService* MDNSResponder::_findService(const MDNSResponder::hMDNSService p_hService)
+    MDNSResponder::stcMDNSService*
+    MDNSResponder::_findService(const MDNSResponder::hMDNSService p_hService)
     {
-
         stcMDNSService* pService = m_pServices;
         while (pService)
         {
@@ -531,7 +521,6 @@ MDNSResponder::stcMDNSService* MDNSResponder::_findService(const MDNSResponder::
         return pService;
     }
 
-
     /*
         SERVICE TXT
     */
@@ -539,23 +528,17 @@ MDNSResponder::stcMDNSService* MDNSResponder::_findService(const MDNSResponder::
     /*
         MDNSResponder::_allocServiceTxt
     */
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_allocServiceTxt(MDNSResponder::stcMDNSService* p_pService,
+    MDNSResponder::stcMDNSServiceTxt*
-        const char* p_pcKey,
+    MDNSResponder::_allocServiceTxt(MDNSResponder::stcMDNSService* p_pService, const char* p_pcKey,
-        const char* p_pcValue,
+                                    const char* p_pcValue, bool p_bTemp)
-        bool p_bTemp)
     {
-
         stcMDNSServiceTxt* pTxt = 0;
 
-    if ((p_pService) &&
+        if ((p_pService) && (p_pcKey)
-            (p_pcKey) &&
+            && (MDNS_SERVICE_TXT_MAXLENGTH > (p_pService->m_Txts.length() + 1 +      // Length byte
-            (MDNS_SERVICE_TXT_MAXLENGTH > (p_pService->m_Txts.length() +
+                                              (p_pcKey ? strlen(p_pcKey) : 0) + 1 +  // '='
-                                           1 +                                 // Length byte
-                                           (p_pcKey ? strlen(p_pcKey) : 0) +
-                                           1 +                                 // '='
                                               (p_pcValue ? strlen(p_pcValue) : 0))))
         {
-
             pTxt = new stcMDNSServiceTxt;
             if (pTxt)
             {
@@ -563,7 +546,8 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_allocServiceTxt(MDNSResponder:
                 pTxt->m_pcKey   = new char[stLength + 1];
                 if (pTxt->m_pcKey)
                 {
-                strncpy(pTxt->m_pcKey, p_pcKey, stLength); pTxt->m_pcKey[stLength] = 0;
+                    strncpy(pTxt->m_pcKey, p_pcKey, stLength);
+                    pTxt->m_pcKey[stLength] = 0;
                 }
 
                 if (p_pcValue)
@@ -572,7 +556,8 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_allocServiceTxt(MDNSResponder:
                     pTxt->m_pcValue = new char[stLength + 1];
                     if (pTxt->m_pcValue)
                     {
-                    strncpy(pTxt->m_pcValue, p_pcValue, stLength); pTxt->m_pcValue[stLength] = 0;
+                        strncpy(pTxt->m_pcValue, p_pcValue, stLength);
+                        pTxt->m_pcValue[stLength] = 0;
                     }
                 }
                 pTxt->m_bTemp = p_bTemp;
@@ -590,26 +575,21 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_allocServiceTxt(MDNSResponder:
     bool MDNSResponder::_releaseServiceTxt(MDNSResponder::stcMDNSService*    p_pService,
                                            MDNSResponder::stcMDNSServiceTxt* p_pTxt)
     {
-
+        return ((p_pService) && (p_pTxt) && (p_pService->m_Txts.remove(p_pTxt)));
-    return ((p_pService) &&
-            (p_pTxt) &&
-            (p_pService->m_Txts.remove(p_pTxt)));
     }
 
     /*
         MDNSResponder::_updateServiceTxt
     */
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_updateServiceTxt(MDNSResponder::stcMDNSService* p_pService,
+    MDNSResponder::stcMDNSServiceTxt*
+    MDNSResponder::_updateServiceTxt(MDNSResponder::stcMDNSService*    p_pService,
                                      MDNSResponder::stcMDNSServiceTxt* p_pTxt,
-        const char* p_pcValue,
+                                     const char* p_pcValue, bool p_bTemp)
-        bool p_bTemp)
     {
-
+        if ((p_pService) && (p_pTxt)
-    if ((p_pService) &&
+            && (MDNS_SERVICE_TXT_MAXLENGTH
-            (p_pTxt) &&
+                > (p_pService->m_Txts.length() - (p_pTxt->m_pcValue ? strlen(p_pTxt->m_pcValue) : 0)
-            (MDNS_SERVICE_TXT_MAXLENGTH > (p_pService->m_Txts.length() -
+                   + (p_pcValue ? strlen(p_pcValue) : 0))))
-                                           (p_pTxt->m_pcValue ? strlen(p_pTxt->m_pcValue) : 0) +
-                                           (p_pcValue ? strlen(p_pcValue) : 0))))
         {
             p_pTxt->update(p_pcValue);
             p_pTxt->m_bTemp = p_bTemp;
@@ -620,38 +600,33 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_updateServiceTxt(MDNSResponder
     /*
         MDNSResponder::_findServiceTxt
     */
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_findServiceTxt(MDNSResponder::stcMDNSService* p_pService,
+    MDNSResponder::stcMDNSServiceTxt*
-        const char* p_pcKey)
+    MDNSResponder::_findServiceTxt(MDNSResponder::stcMDNSService* p_pService, const char* p_pcKey)
     {
-
         return (p_pService ? p_pService->m_Txts.find(p_pcKey) : 0);
     }
 
     /*
         MDNSResponder::_findServiceTxt
     */
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_findServiceTxt(MDNSResponder::stcMDNSService* p_pService,
+    MDNSResponder::stcMDNSServiceTxt*
-        const hMDNSTxt p_hTxt)
+    MDNSResponder::_findServiceTxt(MDNSResponder::stcMDNSService* p_pService, const hMDNSTxt p_hTxt)
     {
-
+        return (((p_pService) && (p_hTxt)) ? p_pService->m_Txts.find((stcMDNSServiceTxt*)p_hTxt)
-    return (((p_pService) && (p_hTxt)) ? p_pService->m_Txts.find((stcMDNSServiceTxt*)p_hTxt) : 0);
+                                           : 0);
     }
 
     /*
         MDNSResponder::_addServiceTxt
     */
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_addServiceTxt(MDNSResponder::stcMDNSService* p_pService,
+    MDNSResponder::stcMDNSServiceTxt*
-        const char* p_pcKey,
+    MDNSResponder::_addServiceTxt(MDNSResponder::stcMDNSService* p_pService, const char* p_pcKey,
-        const char* p_pcValue,
+                                  const char* p_pcValue, bool p_bTemp)
-        bool p_bTemp)
     {
         stcMDNSServiceTxt* pResult = 0;
 
-    if ((p_pService) &&
+        if ((p_pService) && (p_pcKey) && (strlen(p_pcKey)))
-            (p_pcKey) &&
-            (strlen(p_pcKey)))
         {
-
             stcMDNSServiceTxt* pTxt = p_pService->m_Txts.find(p_pcKey);
             if (pTxt)
             {
@@ -665,11 +640,13 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_addServiceTxt(MDNSResponder::s
         return pResult;
     }
 
-MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_answerKeyValue(const hMDNSServiceQuery p_hServiceQuery,
+    MDNSResponder::stcMDNSServiceTxt*
+    MDNSResponder::_answerKeyValue(const hMDNSServiceQuery p_hServiceQuery,
                                    const uint32_t          p_u32AnswerIndex)
     {
         stcMDNSServiceQuery*            pServiceQuery = _findServiceQuery(p_hServiceQuery);
-    stcMDNSServiceQuery::stcAnswer* pSQAnswer = (pServiceQuery ? pServiceQuery->answerAtIndex(p_u32AnswerIndex) : 0);
+        stcMDNSServiceQuery::stcAnswer* pSQAnswer
+            = (pServiceQuery ? pServiceQuery->answerAtIndex(p_u32AnswerIndex) : 0);
         // Fill m_pcTxts (if not already done)
         return (pSQAnswer) ? pSQAnswer->m_Txts.m_pTxts : 0;
     }
@@ -679,7 +656,6 @@ MDNSResponder::stcMDNSServiceTxt* MDNSResponder::_answerKeyValue(const hMDNSServ
     */
     bool MDNSResponder::_collectServiceTxts(MDNSResponder::stcMDNSService& p_rService)
     {
-
         // Call Dynamic service callbacks
         if (m_fnServiceTxtCallback)
         {
@@ -697,11 +673,9 @@ bool MDNSResponder::_collectServiceTxts(MDNSResponder::stcMDNSService& p_rServic
     */
     bool MDNSResponder::_releaseTempServiceTxts(MDNSResponder::stcMDNSService& p_rService)
     {
-
         return (p_rService.m_Txts.removeTempTxts());
     }
 
-
     /*
         MISC
     */
@@ -712,7 +686,6 @@ bool MDNSResponder::_releaseTempServiceTxts(MDNSResponder::stcMDNSService& p_rSe
     */
     bool MDNSResponder::_printRRDomain(const MDNSResponder::stcMDNS_RRDomain& p_RRDomain) const
     {
-
         // DEBUG_OUTPUT.printf_P(PSTR("Domain: "));
 
         const char* pCursor  = p_RRDomain.m_acName;
@@ -746,15 +719,19 @@ bool MDNSResponder::_printRRDomain(const MDNSResponder::stcMDNS_RRDomain& p_RRDo
     */
     bool MDNSResponder::_printRRAnswer(const MDNSResponder::stcMDNS_RRAnswer& p_RRAnswer) const
     {
-
         DEBUG_OUTPUT.printf_P(PSTR("[MDNSResponder] RRAnswer: "));
         _printRRDomain(p_RRAnswer.m_Header.m_Domain);
-    DEBUG_OUTPUT.printf_P(PSTR(" Type:0x%04X Class:0x%04X TTL:%u, "), p_RRAnswer.m_Header.m_Attributes.m_u16Type, p_RRAnswer.m_Header.m_Attributes.m_u16Class, p_RRAnswer.m_u32TTL);
+        DEBUG_OUTPUT.printf_P(PSTR(" Type:0x%04X Class:0x%04X TTL:%u, "),
-    switch (p_RRAnswer.m_Header.m_Attributes.m_u16Type & (~0x8000))     // Topmost bit might carry 'cache flush' flag
+                              p_RRAnswer.m_Header.m_Attributes.m_u16Type,
+                              p_RRAnswer.m_Header.m_Attributes.m_u16Class, p_RRAnswer.m_u32TTL);
+        switch (p_RRAnswer.m_Header.m_Attributes.m_u16Type
+                & (~0x8000))  // Topmost bit might carry 'cache flush' flag
         {
 #ifdef MDNS_IP4_SUPPORT
         case DNS_RRTYPE_A:
-        DEBUG_OUTPUT.printf_P(PSTR("A IP:%s"), ((const stcMDNS_RRAnswerA*)&p_RRAnswer)->m_IPAddress.toString().c_str());
+            DEBUG_OUTPUT.printf_P(
+                PSTR("A IP:%s"),
+                ((const stcMDNS_RRAnswerA*)&p_RRAnswer)->m_IPAddress.toString().c_str());
             break;
 #endif
         case DNS_RRTYPE_PTR:
@@ -775,11 +752,14 @@ bool MDNSResponder::_printRRAnswer(const MDNSResponder::stcMDNS_RRAnswer& p_RRAn
         }
 #ifdef MDNS_IP6_SUPPORT
         case DNS_RRTYPE_AAAA:
-        DEBUG_OUTPUT.printf_P(PSTR("AAAA IP:%s"), ((stcMDNS_RRAnswerA*&)p_rpRRAnswer)->m_IPAddress.toString().c_str());
+            DEBUG_OUTPUT.printf_P(
+                PSTR("AAAA IP:%s"),
+                ((stcMDNS_RRAnswerA*&)p_rpRRAnswer)->m_IPAddress.toString().c_str());
             break;
 #endif
         case DNS_RRTYPE_SRV:
-        DEBUG_OUTPUT.printf_P(PSTR("SRV Port:%u "), ((const stcMDNS_RRAnswerSRV*)&p_RRAnswer)->m_u16Port);
+            DEBUG_OUTPUT.printf_P(PSTR("SRV Port:%u "),
+                                  ((const stcMDNS_RRAnswerSRV*)&p_RRAnswer)->m_u16Port);
             _printRRDomain(((const stcMDNS_RRAnswerSRV*)&p_RRAnswer)->m_SRVDomain);
             break;
         default:
@@ -795,7 +775,3 @@ bool MDNSResponder::_printRRAnswer(const MDNSResponder::stcMDNS_RRAnswer& p_RRAn
 }  // namespace MDNSImplementation
 
 }  // namespace esp8266
-
-
-
-

libraries/ESP8266mDNS/src/LEAmDNS_Priv.h

@@ -48,8 +48,9 @@ namespace MDNSImplementation
 #endif
 
 //
-// If ENABLE_ESP_MDNS_RESPONDER_PASSIV_MODE is defined, the mDNS responder ignores a successful probing
+// If ENABLE_ESP_MDNS_RESPONDER_PASSIV_MODE is defined, the mDNS responder ignores a successful
-// This allows to drive the responder in a environment, where 'update()' isn't called in the loop
+// probing This allows to drive the responder in a environment, where 'update()' isn't called in the
+// loop
 //#define ENABLE_ESP_MDNS_RESPONDER_PASSIV_MODE
 
 // Enable/disable debug trace macros
@@ -88,19 +89,34 @@ namespace MDNSImplementation
 #define DEBUG_OUTPUT Serial
 #endif
 #else
-#define DEBUG_EX_INFO(A)    do { (void)0; } while (0)
+#define DEBUG_EX_INFO(A)                                                                           \
-#define DEBUG_EX_ERR(A)     do { (void)0; } while (0)
+    do                                                                                             \
-#define DEBUG_EX_TX(A)      do { (void)0; } while (0)
+    {                                                                                              \
-#define DEBUG_EX_RX(A)      do { (void)0; } while (0)
+        (void)0;                                                                                   \
+    } while (0)
+#define DEBUG_EX_ERR(A)                                                                            \
+    do                                                                                             \
+    {                                                                                              \
+        (void)0;                                                                                   \
+    } while (0)
+#define DEBUG_EX_TX(A)                                                                             \
+    do                                                                                             \
+    {                                                                                              \
+        (void)0;                                                                                   \
+    } while (0)
+#define DEBUG_EX_RX(A)                                                                             \
+    do                                                                                             \
+    {                                                                                              \
+        (void)0;                                                                                   \
+    } while (0)
 #endif
 
 /*  already defined in lwIP ('lwip/prot/dns.h')
     #ifdef MDNS_IP4_SUPPORT
-    #define DNS_MQUERY_IPV4_GROUP_INIT     (IPAddress(224, 0, 0, 251))              // ip_addr_t v4group = DNS_MQUERY_IPV4_GROUP_INIT
+    #define DNS_MQUERY_IPV4_GROUP_INIT     (IPAddress(224, 0, 0, 251))              // ip_addr_t
-    #endif
+   v4group = DNS_MQUERY_IPV4_GROUP_INIT #endif #ifdef MDNS_IP6_SUPPORT #define
-    #ifdef MDNS_IP6_SUPPORT
+   DNS_MQUERY_IPV6_GROUP_INIT     IPADDR6_INIT_HOST(0xFF020000,0,0,0xFB)   // ip_addr_t v6group =
-    #define DNS_MQUERY_IPV6_GROUP_INIT     IPADDR6_INIT_HOST(0xFF020000,0,0,0xFB)   // ip_addr_t v6group = DNS_MQUERY_IPV6_GROUP_INIT
+   DNS_MQUERY_IPV6_GROUP_INIT #endif*/
-    #endif*/
 //#define MDNS_MULTICAST_PORT               5353
 
 /*
@@ -139,7 +155,8 @@ namespace MDNSImplementation
 /*
     Delay between and number of probes for host and service domains
     Delay between and number of announces for host and service domains
-    Delay between and number of service queries; the delay is multiplied by the resent number in '_checkServiceQueryCache'
+    Delay between and number of service queries; the delay is multiplied by the resent number in
+   '_checkServiceQueryCache'
 */
 #define MDNS_PROBE_DELAY 250
 #define MDNS_PROBE_COUNT 3
@@ -148,7 +165,6 @@ namespace MDNSImplementation
 #define MDNS_DYNAMIC_QUERY_RESEND_COUNT 5
 #define MDNS_DYNAMIC_QUERY_RESEND_DELAY 5000
 
-
 /*
     Force host domain to use only lowercase letters
 */
@@ -177,5 +193,4 @@ namespace MDNSImplementation
 // Include the main header, so the submodlues only need to include this header
 #include "LEAmDNS.h"
 
-
 #endif  // MDNS_PRIV_H

libraries/Hash/examples/sha1/sha1.ino

@@ -22,9 +22,7 @@ void loop() {
   sha1("test", &hash[0]);
 
   Serial.print("SHA1:");
-  for (uint16_t i = 0; i < 20; i++) {
+  for (uint16_t i = 0; i < 20; i++) { Serial.printf("%02x", hash[i]); }
-    Serial.printf("%02x", hash[i]);
-  }
   Serial.println();
 
   delay(1000);

libraries/I2S/examples/InputSerialPlotter/InputSerialPlotter.ino

@@ -21,7 +21,8 @@ void setup() {
   // start I2S at 8 kHz with 24-bits per sample
   if (!I2S.begin(I2S_PHILIPS_MODE, 8000, 24)) {
     Serial.println("Failed to initialize I2S!");
-    while (1); // do nothing
+    while (1)
+      ;  // do nothing
   }
 }
 

libraries/I2S/examples/SimpleTone/SimpleTone.ino

@@ -26,7 +26,8 @@ void setup() {
   // start I2S at the sample rate with 16-bits per sample
   if (!I2S.begin(I2S_PHILIPS_MODE, sampleRate, 16)) {
     Serial.println("Failed to initialize I2S!");
-    while (1); // do nothing
+    while (1)
+      ;  // do nothing
   }
 }
 
@@ -43,4 +44,3 @@ void loop() {
   // increment the counter for the next sample
   count++;
 }
-

libraries/LittleFS/examples/LittleFS_Timestamp/LittleFS_Timestamp.ino

@@ -51,9 +51,7 @@ void readFile(const char * path) {
   }
 
   Serial.print("Read from file: ");
-  while (file.available()) {
+  while (file.available()) { Serial.write(file.read()); }
-    Serial.write(file.read());
-  }
   file.close();
 }
 
@@ -158,9 +156,6 @@ void setup() {
   }
   readFile("/hello.txt");
   listDir("/");
-
-
 }
 
 void loop() {}
-

libraries/LittleFS/examples/SpeedTest/SpeedTest.ino

@@ -44,9 +44,7 @@ void DoTest(FS *fs) {
   }
 
   uint8_t data[256];
-  for (int i = 0; i < 256; i++) {
+  for (int i = 0; i < 256; i++) { data[i] = (uint8_t)i; }
-    data[i] = (uint8_t) i;
-  }
 
   Serial.printf("Creating %dKB file, may take a while...\n", TESTSIZEKB);
   unsigned long start = millis();
@@ -56,9 +54,7 @@ void DoTest(FS *fs) {
     return;
   }
   for (int i = 0; i < TESTSIZEKB; i++) {
-    for (int j = 0; j < 4; j++) {
+    for (int j = 0; j < 4; j++) { f.write(data, 256); }
-      f.write(data, 256);
-    }
   }
   f.close();
   unsigned long stop = millis();
@@ -72,9 +68,7 @@ void DoTest(FS *fs) {
   start = millis();
   f = fs->open("/testwrite.bin", "r");
   for (int i = 0; i < TESTSIZEKB; i++) {
-    for (int j = 0; j < 4; j++) {
+    for (int j = 0; j < 4; j++) { f.read(data, 256); }
-      f.read(data, 256);
-    }
   }
   f.close();
   stop = millis();
@@ -85,9 +79,7 @@ void DoTest(FS *fs) {
   f = fs->open("/testwrite.bin", "r");
   f.read();
   for (int i = 0; i < TESTSIZEKB; i++) {
-    for (int j = 0; j < 4; j++) {
+    for (int j = 0; j < 4; j++) { f.read(data + 1, 256); }
-      f.read(data + 1, 256);
-    }
   }
   f.close();
   stop = millis();
@@ -115,9 +107,7 @@ void DoTest(FS *fs) {
   Serial.printf("Writing 64K file in 1-byte chunks\n");
   start = millis();
   f = fs->open("/test1b.bin", "w");
-  for (int i = 0; i < 65536; i++) {
+  for (int i = 0; i < 65536; i++) { f.write((uint8_t *)&i, 1); }
-    f.write((uint8_t*)&i, 1);
-  }
   f.close();
   stop = millis();
   Serial.printf("==> Time to write 64KB in 1b chunks = %lu milliseconds = %s\n", stop - start, rate(start, stop, 65536));

libraries/Netdump/examples/Netdump/Netdump.ino

@@ -29,11 +29,9 @@ File             tracefile;
 
 std::map<PacketType, int> packetCount;
 
-enum class SerialOption : uint8_t {
+enum class SerialOption : uint8_t { AllFull,
-  AllFull,
                                     LocalNone,
-  HTTPChar
+                                    HTTPChar };
-};
 
 void startSerial(SerialOption option) {
   switch (option) {
@@ -42,21 +40,16 @@ void startSerial(SerialOption option) {
       break;
 
     case SerialOption::LocalNone:  // Only local IP traffic, full details
-      nd.printDump(Serial, Packet::PacketDetail::NONE,
+      nd.printDump(Serial, Packet::PacketDetail::NONE, [](Packet n) {
-      [](Packet n) {
         return (n.hasIP(WiFi.localIP()));
-      }
+      });
-                  );
       break;
     case SerialOption::HTTPChar:  // Only HTTP traffic, show packet content as chars
-      nd.printDump(Serial, Packet::PacketDetail::CHAR,
+      nd.printDump(Serial, Packet::PacketDetail::CHAR, [](Packet n) {
-      [](Packet n) {
         return (n.isHTTP());
-      }
+      });
-                  );
       break;
-    default :
+    default: Serial.printf("No valid SerialOption provided\r\n");
-      Serial.printf("No valid SerialOption provided\r\n");
   };
 }
 
@@ -80,44 +73,34 @@ void setup(void) {
 
   if (WiFi.waitForConnectResult() != WL_CONNECTED) {
     Serial.println("WiFi Failed, stopping sketch");
-    while (1) {
+    while (1) { delay(1000); }
-      delay(1000);
-    }
   }
 
-  if (!MDNS.begin("netdumphost")) {
+  if (!MDNS.begin("netdumphost")) { Serial.println("Error setting up MDNS responder!"); }
-    Serial.println("Error setting up MDNS responder!");
-  }
 
   filesystem->begin();
 
-  webServer.on("/list",
+  webServer.on("/list", []() {
-  []() {
     Dir dir = filesystem->openDir("/");
     String d = "<h1>File list</h1>";
     while (dir.next()) {
       d.concat("<li>" + dir.fileName() + "</li>");
     }
     webServer.send(200, "text.html", d);
-  }
+  });
-              );
 
-  webServer.on("/req",
+  webServer.on("/req", []() {
-  []() {
     static int rq = 0;
     String a = "<h1>You are connected, Number of requests = " + String(rq++) + "</h1>";
     webServer.send(200, "text/html", a);
-  }
+  });
-              );
 
-  webServer.on("/reset",
+  webServer.on("/reset", []() {
-  []() {
     nd.reset();
     tracefile.close();
     tcpServer.close();
     webServer.send(200, "text.html", "<h1>Netdump session reset</h1>");
-  }
+  });
-              );
 
   webServer.serveStatic("/", *filesystem, "/");
   webServer.begin();
@@ -153,4 +136,3 @@ void loop(void) {
   webServer.handleClient();
   MDNS.update();
 }
-

libraries/Netdump/src/Netdump.cpp

@@ -23,7 +23,6 @@
 #include <lwip/init.h>
 #include "Schedule.h"
 
-
 namespace NetCapture
 {
 
@@ -69,24 +68,26 @@ void Netdump::reset()
 void Netdump::printDump(Print& out, Packet::PacketDetail ndd, const Filter nf)
 {
     out.printf_P(PSTR("netDump starting\r\n"));
-    setCallback([&out, ndd, this](const Packet & ndp)
+    setCallback(
+        [&out, ndd, this](const Packet& ndp)
         {
             printDumpProcess(out, ndd, ndp);
-    }, nf);
+        },
+        nf);
 }
 
 void Netdump::fileDump(File& outfile, const Filter nf)
 {
-
     writePcapHeader(outfile);
-    setCallback([&outfile, this](const Packet & ndp)
+    setCallback(
+        [&outfile, this](const Packet& ndp)
         {
             fileDumpProcess(outfile, ndp);
-    }, nf);
+        },
+        nf);
 }
 bool Netdump::tcpDump(WiFiServer& tcpDumpServer, const Filter nf)
 {
-
     if (!packetBuffer)
     {
         packetBuffer = new (std::nothrow) char[tcpBufferSize];
@@ -98,7 +99,8 @@ bool Netdump::tcpDump(WiFiServer &tcpDumpServer, const Filter nf)
     }
     bufferIndex = 0;
 
-    schedule_function([&tcpDumpServer, this, nf]()
+    schedule_function(
+        [&tcpDumpServer, this, nf]()
         {
             tcpDumpLoop(tcpDumpServer, nf);
         });
@@ -109,7 +111,8 @@ void Netdump::capture(int netif_idx, const char* data, size_t len, int out, int
 {
     if (lwipCallback.execute(netif_idx, data, len, out, success) == 0)
     {
-        phy_capture = nullptr; // No active callback/netdump instances, will be set again by new object.
+        phy_capture
+            = nullptr;  // No active callback/netdump instances, will be set again by new object.
     }
 }
 
@@ -199,10 +202,12 @@ void Netdump::tcpDumpLoop(WiFiServer &tcpDumpServer, const Filter nf)
         bufferIndex = 0;
         writePcapHeader(tcpDumpClient);
 
-        setCallback([this](const Packet & ndp)
+        setCallback(
+            [this](const Packet& ndp)
             {
                 tcpDumpProcess(ndp);
-        }, nf);
+            },
+            nf);
     }
     if (!tcpDumpClient || !tcpDumpClient.connected())
     {
@@ -216,7 +221,8 @@ void Netdump::tcpDumpLoop(WiFiServer &tcpDumpServer, const Filter nf)
 
     if (tcpDumpServer.status() != CLOSED)
     {
-        schedule_function([&tcpDumpServer, this, nf]()
+        schedule_function(
+            [&tcpDumpServer, this, nf]()
             {
                 tcpDumpLoop(tcpDumpServer, nf);
             });

libraries/Netdump/src/Netdump.h

@@ -38,7 +38,6 @@ using namespace experimental::CBListImplentation;
 class Netdump
 {
 public:
-
     using Filter       = std::function<bool(const Packet&)>;
     using Callback     = std::function<void(const Packet&)>;
     using LwipCallback = std::function<void(int, const char*, int, int, int)>;
@@ -55,7 +54,6 @@ public:
     void fileDump(File& outfile, const Filter nf = nullptr);
     bool tcpDump(WiFiServer& tcpDumpServer, const Filter nf = nullptr);
 
-
 private:
     Callback netDumpCallback = nullptr;
     Filter   netDumpFilter   = nullptr;

libraries/Netdump/src/NetdumpIP.cpp

@@ -24,11 +24,10 @@
 namespace NetCapture
 {
 
-NetdumpIP::NetdumpIP()
+NetdumpIP::NetdumpIP() { }
-{
-}
 
-NetdumpIP::NetdumpIP(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
+NetdumpIP::NetdumpIP(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet,
+                     uint8_t fourth_octet)
 {
     setV4();
     (*this)[0] = first_octet;
@@ -206,7 +205,8 @@ bool NetdumpIP::fromString6(const char *address)
     {
         for (int i = dots - doubledots - 1; i >= 0; i--)
         {
-            reinterpret_cast<uint16_t*>(rawip)[8 - dots + doubledots + i] = reinterpret_cast<uint16_t*>(rawip)[doubledots + i];
+            reinterpret_cast<uint16_t*>(rawip)[8 - dots + doubledots + i]
+                = reinterpret_cast<uint16_t*>(rawip)[doubledots + i];
         }
         for (int i = doubledots; i < 8 - dots + doubledots; i++)
         {
@@ -224,7 +224,6 @@ String NetdumpIP::toString()
     if (isV6())
     {
         sstr.reserve(40);  // 8 shorts x 4 chars each + 7 colons + nullterm
-
     }
     else
     {

libraries/Netdump/src/NetdumpIP.h

@@ -36,7 +36,12 @@ public:
     String toString();
 
 private:
-    enum class IPversion {UNSET, IPV4, IPV6};
+    enum class IPversion
+    {
+        UNSET,
+        IPV4,
+        IPV6
+    };
     IPversion ipv = IPversion::UNSET;
 
     uint8_t rawip[16] = { 0 };
@@ -78,6 +83,7 @@ private:
     bool fromString6(const char* address);
 
     size_t printTo(Print& p);
+
 public:
     bool operator==(const IPAddress& addr) const
     {
@@ -95,7 +101,6 @@ public:
     {
         return !compareIP(addr);
     };
-
 };
 
 }  // namespace NetCapture

libraries/Netdump/src/NetdumpPacket.cpp

@@ -25,7 +25,8 @@
 namespace NetCapture
 {
 
-void Packet::printDetail(Print& out, const String& indent, const char* data, size_t size, PacketDetail pd) const
+void Packet::printDetail(Print& out, const String& indent, const char* data, size_t size,
+                         PacketDetail pd) const
 {
     if (pd == PacketDetail::NONE)
     {
@@ -159,21 +160,24 @@ void Packet::MACtoString(int dataIdx, StreamString& sstr) const
             sstr.print(':');
         }
     }
-
 }
 
 void Packet::ARPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
 {
     switch (getARPType())
     {
-    case 1 : sstr.printf_P(PSTR("who has %s tell %s"), getIP(ETH_HDR_LEN + 24).toString().c_str(), getIP(ETH_HDR_LEN + 14).toString().c_str());
+    case 1:
+        sstr.printf_P(PSTR("who has %s tell %s"), getIP(ETH_HDR_LEN + 24).toString().c_str(),
+                      getIP(ETH_HDR_LEN + 14).toString().c_str());
         break;
-    case 2 : sstr.printf_P(PSTR("%s is at "), getIP(ETH_HDR_LEN + 14).toString().c_str());
+    case 2:
+        sstr.printf_P(PSTR("%s is at "), getIP(ETH_HDR_LEN + 14).toString().c_str());
         MACtoString(ETH_HDR_LEN + 8, sstr);
         break;
     }
     sstr.printf("\r\n");
-    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN], packetLength - ETH_HDR_LEN, netdumpDetail);
+    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN], packetLength - ETH_HDR_LEN,
+                netdumpDetail);
 }
 
 void Packet::DNStoString(PacketDetail netdumpDetail, StreamString& sstr) const
@@ -198,8 +202,10 @@ void Packet::DNStoString(PacketDetail netdumpDetail, StreamString& sstr) const
         sstr.printf_P(PSTR("DR=%d "), t);
     }
     sstr.printf_P(PSTR("\r\n"));
-    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getUdpHdrLen(), netdumpDetail);
+    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getUdpHdrLen(),
-    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getUdpHdrLen()], getUdpLen(), netdumpDetail);
+                netdumpDetail);
+    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getUdpHdrLen()],
+                getUdpLen(), netdumpDetail);
 }
 
 void Packet::UDPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
@@ -207,8 +213,10 @@ void Packet::UDPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
     sstr.printf_P(PSTR("%s>%s "), sourceIP().toString().c_str(), destIP().toString().c_str());
     sstr.printf_P(PSTR("%d:%d"), getSrcPort(), getDstPort());
     sstr.printf_P(PSTR("\r\n"));
-    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getUdpHdrLen(), netdumpDetail);
+    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getUdpHdrLen(),
-    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getUdpHdrLen()], getUdpLen(), netdumpDetail);
+                netdumpDetail);
+    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getUdpHdrLen()],
+                getUdpLen(), netdumpDetail);
 }
 
 void Packet::TCPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
@@ -224,10 +232,13 @@ void Packet::TCPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
             sstr.print(chars[i]);
         }
     sstr.print(']');
-    sstr.printf_P(PSTR(" len: %u seq: %u, ack: %u, wnd: %u "), getTcpLen(), getTcpSeq(), getTcpAck(), getTcpWindow());
+    sstr.printf_P(PSTR(" len: %u seq: %u, ack: %u, wnd: %u "), getTcpLen(), getTcpSeq(),
+                  getTcpAck(), getTcpWindow());
     sstr.printf_P(PSTR("\r\n"));
-    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getTcpHdrLen(), netdumpDetail);
+    printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN + getIpHdrLen()], getTcpHdrLen(),
-    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getTcpHdrLen()], getTcpLen(), netdumpDetail);
+                netdumpDetail);
+    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen() + getTcpHdrLen()],
+                getTcpLen(), netdumpDetail);
 }
 
 void Packet::ICMPtoString(PacketDetail, StreamString& sstr) const
@@ -237,20 +248,36 @@ void Packet::ICMPtoString(PacketDetail, StreamString& sstr) const
     {
         switch (getIcmpType())
         {
-        case 0 : sstr.printf_P(PSTR("ping reply")); break;
+        case 0:
-        case 8 : sstr.printf_P(PSTR("ping request")); break;
+            sstr.printf_P(PSTR("ping reply"));
-        default: sstr.printf_P(PSTR("type(0x%02x)"), getIcmpType()); break;
+            break;
+        case 8:
+            sstr.printf_P(PSTR("ping request"));
+            break;
+        default:
+            sstr.printf_P(PSTR("type(0x%02x)"), getIcmpType());
+            break;
         }
     }
     if (isIPv6())
     {
         switch (getIcmpType())
         {
-        case 129 : sstr.printf_P(PSTR("ping reply")); break;
+        case 129:
-        case 128 : sstr.printf_P(PSTR("ping request")); break;
+            sstr.printf_P(PSTR("ping reply"));
-        case 135 : sstr.printf_P(PSTR("Neighbour solicitation")); break;
+            break;
-        case 136 : sstr.printf_P(PSTR("Neighbour advertisement")); break;
+        case 128:
-        default: sstr.printf_P(PSTR("type(0x%02x)"), getIcmpType()); break;
+            sstr.printf_P(PSTR("ping request"));
+            break;
+        case 135:
+            sstr.printf_P(PSTR("Neighbour solicitation"));
+            break;
+        case 136:
+            sstr.printf_P(PSTR("Neighbour advertisement"));
+            break;
+        default:
+            sstr.printf_P(PSTR("type(0x%02x)"), getIcmpType());
+            break;
         }
     }
     sstr.printf_P(PSTR("\r\n"));
@@ -260,18 +287,42 @@ void Packet::IGMPtoString(PacketDetail, StreamString& sstr) const
 {
     switch (getIgmpType())
     {
-    case 1 : sstr.printf_P(PSTR("Create Group Request")); break;
+    case 1:
-    case 2 : sstr.printf_P(PSTR("Create Group Reply")); break;
+        sstr.printf_P(PSTR("Create Group Request"));
-    case 3 : sstr.printf_P(PSTR("Join Group Request")); break;
+        break;
-    case 4 : sstr.printf_P(PSTR("Join Group Reply")); break;
+    case 2:
-    case 5 : sstr.printf_P(PSTR("Leave Group Request")); break;
+        sstr.printf_P(PSTR("Create Group Reply"));
-    case 6 : sstr.printf_P(PSTR("Leave Group Reply")); break;
+        break;
-    case 7 : sstr.printf_P(PSTR("Confirm Group Request")); break;
+    case 3:
-    case 8 : sstr.printf_P(PSTR("Confirm Group Reply")); break;
+        sstr.printf_P(PSTR("Join Group Request"));
-    case 0x11 : sstr.printf_P(PSTR("Group Membership Query")); break;
+        break;
-    case 0x12 : sstr.printf_P(PSTR("IGMPv1 Membership Report")); break;
+    case 4:
-    case 0x22 : sstr.printf_P(PSTR("IGMPv3 Membership Report")); break;
+        sstr.printf_P(PSTR("Join Group Reply"));
-    default: sstr.printf_P(PSTR("type(0x%02x)"), getIgmpType()); break;
+        break;
+    case 5:
+        sstr.printf_P(PSTR("Leave Group Request"));
+        break;
+    case 6:
+        sstr.printf_P(PSTR("Leave Group Reply"));
+        break;
+    case 7:
+        sstr.printf_P(PSTR("Confirm Group Request"));
+        break;
+    case 8:
+        sstr.printf_P(PSTR("Confirm Group Reply"));
+        break;
+    case 0x11:
+        sstr.printf_P(PSTR("Group Membership Query"));
+        break;
+    case 0x12:
+        sstr.printf_P(PSTR("IGMPv1 Membership Report"));
+        break;
+    case 0x22:
+        sstr.printf_P(PSTR("IGMPv3 Membership Report"));
+        break;
+    default:
+        sstr.printf_P(PSTR("type(0x%02x)"), getIgmpType());
+        break;
     }
     sstr.printf_P(PSTR("\r\n"));
 }
@@ -281,7 +332,8 @@ void Packet::IPtoString(PacketDetail netdumpDetail, StreamString& sstr) const
     sstr.printf_P(PSTR("%s>%s "), sourceIP().toString().c_str(), destIP().toString().c_str());
     sstr.printf_P(PSTR("Unknown IP type : %d\r\n"), ipType());
     printDetail(sstr, PSTR("           H "), &data[ETH_HDR_LEN], getIpHdrLen(), netdumpDetail);
-    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen()], getIpTotalLen() - getIpHdrLen(), netdumpDetail);
+    printDetail(sstr, PSTR("           D "), &data[ETH_HDR_LEN + getIpHdrLen()],
+                getIpTotalLen() - getIpHdrLen(), netdumpDetail);
 }
 
 void Packet::UKNWtoString(PacketDetail, StreamString& sstr) const
@@ -298,13 +350,13 @@ const String Packet::toString() const
     return toString(PacketDetail::NONE);
 }
 
-
 const String Packet::toString(PacketDetail netdumpDetail) const
 {
     StreamString sstr;
     sstr.reserve(128);
 
-    sstr.printf_P(PSTR("%d %3s %-4s "), netif_idx, out ? "out" : "in ", packetType().toString().c_str());
+    sstr.printf_P(PSTR("%d %3s %-4s "), netif_idx, out ? "out" : "in ",
+                  packetType().toString().c_str());
 
     if (netdumpDetail == PacketDetail::RAW)
     {

libraries/Netdump/src/NetdumpPacket.h

@@ -37,8 +37,8 @@ int constexpr ETH_HDR_LEN = 14;
 class Packet
 {
 public:
-    Packet(unsigned long msec, int n, const char* d, size_t l, int o, int s)
+    Packet(unsigned long msec, int n, const char* d, size_t l, int o, int s) :
-        : packetTime(msec), netif_idx(n), data(d), packetLength(l), out(o), success(s)
+        packetTime(msec), netif_idx(n), data(d), packetLength(l), out(o), success(s)
     {
         setPacketTypes();
     };
@@ -93,7 +93,8 @@ public:
     };
     uint16_t getIpHdrLen() const
     {
-        return isIPv4() ? (((unsigned char)data[ETH_HDR_LEN]) & 0x0f) << 2 : 40 ;   // IPv6 is fixed length
+        return isIPv4() ? (((unsigned char)data[ETH_HDR_LEN]) & 0x0f) << 2
+                        : 40;  // IPv6 is fixed length
     }
     uint16_t getIpTotalLen() const
     {
@@ -277,14 +278,13 @@ public:
 
     const String toString() const;
     const String toString(PacketDetail netdumpDetail) const;
-    void printDetail(Print& out, const String& indent, const char* data, size_t size, PacketDetail pd) const;
+    void         printDetail(Print& out, const String& indent, const char* data, size_t size,
+                             PacketDetail pd) const;
 
     const PacketType               packetType() const;
     const std::vector<PacketType>& allPacketTypes() const;
 
-
 private:
-
     void setPacketType(PacketType);
     void setPacketTypes();
 
@@ -298,7 +298,6 @@ private:
     void IPtoString(PacketDetail netdumpDetail, StreamString& sstr) const;
     void UKNWtoString(PacketDetail netdumpDetail, StreamString& sstr) const;
 
-
     time_t                  packetTime;
     int                     netif_idx;
     const char*             data;

libraries/Netdump/src/PacketType.cpp

@@ -10,33 +10,50 @@
 namespace NetCapture
 {
 
-PacketType::PacketType()
+PacketType::PacketType() { }
-{
-}
 
 String PacketType::toString() const
 {
     switch (ptype)
     {
-    case PType::ARP :    return PSTR("ARP");
+    case PType::ARP:
-    case PType::IP :     return PSTR("IP");
+        return PSTR("ARP");
-    case PType::UDP :    return PSTR("UDP");
+    case PType::IP:
-    case PType::MDNS :   return PSTR("MDNS");
+        return PSTR("IP");
-    case PType::DNS :    return PSTR("DNS");
+    case PType::UDP:
-    case PType::SSDP :   return PSTR("SSDP");
+        return PSTR("UDP");
-    case PType::DHCP :   return PSTR("DHCP");
+    case PType::MDNS:
-    case PType::WSDD :   return PSTR("WSDD");
+        return PSTR("MDNS");
-    case PType::NETBIOS: return PSTR("NBIO");
+    case PType::DNS:
-    case PType::SMB :    return PSTR("SMB");
+        return PSTR("DNS");
-    case PType::OTA :    return PSTR("OTA");
+    case PType::SSDP:
-    case PType::TCP :    return PSTR("TCP");
+        return PSTR("SSDP");
-    case PType::HTTP :   return PSTR("HTTP");
+    case PType::DHCP:
-    case PType::ICMP :   return PSTR("ICMP");
+        return PSTR("DHCP");
-    case PType::IGMP :   return PSTR("IGMP");
+    case PType::WSDD:
-    case PType::IPv4:    return PSTR("IPv4");
+        return PSTR("WSDD");
-    case PType::IPv6:    return PSTR("IPv6");
+    case PType::NETBIOS:
-    case PType::UKNW :   return PSTR("UKNW");
+        return PSTR("NBIO");
-    default :            return PSTR("ERR");
+    case PType::SMB:
+        return PSTR("SMB");
+    case PType::OTA:
+        return PSTR("OTA");
+    case PType::TCP:
+        return PSTR("TCP");
+    case PType::HTTP:
+        return PSTR("HTTP");
+    case PType::ICMP:
+        return PSTR("ICMP");
+    case PType::IGMP:
+        return PSTR("IGMP");
+    case PType::IPv4:
+        return PSTR("IPv4");
+    case PType::IPv6:
+        return PSTR("IPv6");
+    case PType::UKNW:
+        return PSTR("UKNW");
+    default:
+        return PSTR("ERR");
     };
 }
 

libraries/Netdump/src/PacketType.h

@@ -15,7 +15,6 @@ namespace NetCapture
 class PacketType
 {
 public:
-
     enum PType : int
     {
         ARP,

libraries/SD/examples/Datalogger/Datalogger.ino

@@ -48,9 +48,7 @@ void loop() {
   for (int analogPin = 0; analogPin < 3; analogPin++) {
     int sensor = analogRead(analogPin);
     dataString += String(sensor);
-    if (analogPin < 2) {
+    if (analogPin < 2) { dataString += ","; }
-      dataString += ",";
-    }
   }
 
   // open the file. note that only one file can be open at a time,
@@ -65,16 +63,5 @@ void loop() {
     Serial.println(dataString);
   }
   // if the file isn't open, pop up an error:
-  else {
+  else { Serial.println("error opening datalog.txt"); }
-    Serial.println("error opening datalog.txt");
 }
-}
-
-
-
-
-
-
-
-
-

libraries/SD/examples/DumpFile/DumpFile.ino

@@ -45,17 +45,11 @@ void setup() {
 
   // if the file is available, write to it:
   if (dataFile) {
-    while (dataFile.available()) {
+    while (dataFile.available()) { Serial.write(dataFile.read()); }
-      Serial.write(dataFile.read());
-    }
     dataFile.close();
   }
   // if the file isn't open, pop up an error:
-  else {
+  else { Serial.println("error opening datalog.txt"); }
-    Serial.println("error opening datalog.txt");
-  }
-}
-
-void loop() {
 }
 
+void loop() {}

libraries/SD/examples/Files/Files.ino

@@ -66,6 +66,3 @@ void setup() {
 void loop() {
   // nothing happens after setup finishes.
 }
-
-
-

libraries/SD/examples/ReadWrite/ReadWrite.ino

@@ -57,9 +57,7 @@ void setup() {
     Serial.println("test.txt:");
 
     // read from the file until there's nothing else in it:
-    while (myFile.available()) {
+    while (myFile.available()) { Serial.write(myFile.read()); }
-      Serial.write(myFile.read());
-    }
     // close the file:
     myFile.close();
   } else {
@@ -71,5 +69,3 @@ void setup() {
 void loop() {
   // nothing happens after setup
 }
-
-

libraries/SD/examples/listfiles/listfiles.ino

@@ -57,9 +57,7 @@ void printDirectory(File dir, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (uint8_t i = 0; i < numTabs; i++) { Serial.print('\t'); }
-      Serial.print('\t');
-    }
     Serial.print(entry.name());
     if (entry.isDirectory()) {
       Serial.println("/");

libraries/SPISlave/examples/SPISlave_Master/SPISlave_Master.ino

@@ -21,7 +21,8 @@ class ESPMaster {
   uint8_t _ss_pin;
 
 public:
-    ESPMaster(uint8_t pin): _ss_pin(pin) {}
+  ESPMaster(uint8_t pin)
+    : _ss_pin(pin) {}
   void begin() {
     pinMode(_ss_pin, OUTPUT);
     digitalWrite(_ss_pin, HIGH);
@@ -49,9 +50,7 @@ class ESPMaster {
     digitalWrite(_ss_pin, LOW);
     SPI.transfer(0x03);
     SPI.transfer(0x00);
-      for (uint8_t i = 0; i < 32; i++) {
+    for (uint8_t i = 0; i < 32; i++) { data[i] = SPI.transfer(0); }
-        data[i] = SPI.transfer(0);
-      }
     digitalWrite(_ss_pin, HIGH);
   }
 
@@ -60,12 +59,8 @@ class ESPMaster {
     digitalWrite(_ss_pin, LOW);
     SPI.transfer(0x02);
     SPI.transfer(0x00);
-      while (len-- && i < 32) {
+    while (len-- && i < 32) { SPI.transfer(data[i++]); }
-        SPI.transfer(data[i++]);
+    while (i++ < 32) { SPI.transfer(0); }
-      }
-      while (i++ < 32) {
-        SPI.transfer(0);
-      }
     digitalWrite(_ss_pin, HIGH);
   }