Merge pull request #7692 from 0xc0170/fix_netsocket_style

netsocket: astyle fix

features/netsocket/CellularBase.h

@@ -112,7 +112,8 @@ public:
      */
     virtual const char *get_gateway() = 0;
 
-    virtual CellularBase *cellularBase() {
+    virtual CellularBase *cellularBase()
+    {
         return this;
     }
 

features/netsocket/EMACInterface.h

@@ -36,8 +36,7 @@
  * the credentials have been set. This is necessary to support specialised
  * applications such as 6LoWPAN mesh border routers.
  */
-class EMACInterface : public virtual NetworkInterface
+class EMACInterface : public virtual NetworkInterface {
-{
 public:
     /** Create an EMAC-based network interface.
      *
@@ -52,8 +51,7 @@ public:
      * @param emac  Reference to EMAC to use
      * @param stack Reference to onboard-network stack to use
      */
-    EMACInterface(
+    EMACInterface(EMAC &emac = EMAC::get_default_instance(),
-            EMAC &emac = EMAC::get_default_instance(),
                   OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance());
 
     /** Set a static IP address
@@ -67,8 +65,7 @@ public:
      *  @param gateway     Null-terminated representation of the local gateway
      *  @return            0 on success, negative error code on failure
      */
-    virtual nsapi_error_t set_network(
+    virtual nsapi_error_t set_network(const char *ip_address, const char *netmask, const char *gateway);
-            const char *ip_address, const char *netmask, const char *gateway);
 
     /** Enable or disable DHCP on the network
      *
@@ -148,9 +145,13 @@ public:
      *
      * @return          Reference to the EMAC in use
      */
-    EMAC &get_emac() const { return _emac; }
+    EMAC &get_emac() const
+    {
+        return _emac;
+    }
 
-    virtual EMACInterface *emacInterface() {
+    virtual EMACInterface *emacInterface()
+    {
         return this;
     }
 

features/netsocket/EthInterface.h

@@ -27,11 +27,11 @@
  *
  *  Common interface that is shared between ethernet hardware.
  */
-class EthInterface : public virtual NetworkInterface
+class EthInterface : public virtual NetworkInterface {
-{
 public:
 
-    virtual EthInterface *ethInterface() {
+    virtual EthInterface *ethInterface()
+    {
         return this;
     }
 

features/netsocket/EthernetInterface.h

@@ -25,8 +25,7 @@
 /** EthernetInterface class
  *  Implementation of the NetworkStack for an EMAC-based Ethernet driver
  */
-class EthernetInterface : public EMACInterface, public EthInterface
+class EthernetInterface : public EMACInterface, public EthInterface {
-{
 public:
     /** Create an EMAC-based ethernet interface.
      *
@@ -41,8 +40,7 @@ public:
      * @param emac  Reference to EMAC to use
      * @param stack Reference to onboard-network stack to use
      */
-    EthernetInterface(
+    EthernetInterface(EMAC &emac = EMAC::get_default_instance(),
-            EMAC &emac = EMAC::get_default_instance(),
                       OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance()) : EMACInterface(emac, stack) { }
 };
 

features/netsocket/InternetSocket.cpp

@@ -186,7 +186,7 @@ nsapi_error_t InternetSocket::getsockopt(int level, int optname, void *optval, u
 }
 void InternetSocket::event()
 {
-    _event_flag.set(READ_FLAG|WRITE_FLAG);
+    _event_flag.set(READ_FLAG | WRITE_FLAG);
 
     _pending += 1;
     if (_callback && _pending == 1) {

features/netsocket/InternetSocket.h

@@ -50,7 +50,8 @@ public:
     nsapi_error_t open(NetworkStack *stack);
 
     template <typename S>
-    nsapi_error_t open(S *stack) {
+    nsapi_error_t open(S *stack)
+    {
         return open(nsapi_create_stack(stack));
     }
 
@@ -211,7 +212,8 @@ public:
     MBED_DEPRECATED_SINCE("mbed-os-5.1",
                           "The attach function does not support cv-qualifiers. Replaced by "
                           "attach(callback(obj, method)).")
-    void attach(T *obj, M method) {
+    void attach(T *obj, M method)
+    {
         attach(mbed::callback(obj, method));
     }
 

features/netsocket/MeshInterface.h

@@ -27,11 +27,11 @@
  *
  *  Common interface that is shared between mesh hardware
  */
-class MeshInterface : public virtual NetworkInterface
+class MeshInterface : public virtual NetworkInterface {
-{
 public:
 
-    virtual MeshInterface *meshInterface() {
+    virtual MeshInterface *meshInterface()
+    {
         return this;
     }
 

features/netsocket/NetworkInterface.h

@@ -122,8 +122,7 @@ public:
      *  @param gateway    Null-terminated representation of the local gateway
      *  @return           0 on success, negative error code on failure
      */
-    virtual nsapi_error_t set_network(
+    virtual nsapi_error_t set_network(const char *ip_address, const char *netmask, const char *gateway);
-            const char *ip_address, const char *netmask, const char *gateway);
 
     /** Enable or disable DHCP on the network
      *
@@ -245,27 +244,32 @@ public:
     virtual nsapi_error_t set_blocking(bool blocking);
 
     /** Dynamic downcast to an EthInterface */
-    virtual EthInterface *ethInterface() {
+    virtual EthInterface *ethInterface()
+    {
         return 0;
     }
 
     /** Dynamic downcast to a WiFiInterface */
-    virtual WiFiInterface *wifiInterface() {
+    virtual WiFiInterface *wifiInterface()
+    {
         return 0;
     }
 
     /** Dynamic downcast to a MeshInterface */
-    virtual MeshInterface *meshInterface() {
+    virtual MeshInterface *meshInterface()
+    {
         return 0;
     }
 
     /** Dynamic downcast to a CellularBase */
-    virtual CellularBase *cellularBase() {
+    virtual CellularBase *cellularBase()
+    {
         return 0;
     }
 
     /** Dynamic downcast to an EMACInterface */
-    virtual EMACInterface *emacInterface() {
+    virtual EMACInterface *emacInterface()
+    {
         return 0;
     }
 

features/netsocket/NetworkStack.cpp

@@ -148,8 +148,7 @@ call_in_callback_cb_t NetworkStack::get_call_in_callback()
 }
 
 // NetworkStackWrapper class for encapsulating the raw nsapi_stack structure
-class NetworkStackWrapper : public NetworkStack
+class NetworkStackWrapper : public NetworkStack {
-{
 private:
     inline nsapi_stack_t *_stack()
     {

features/netsocket/NetworkStack.h

@@ -34,8 +34,7 @@ class OnboardNetworkStack;
  *  for instantiating network sockets.
  *  @addtogroup netsocket
  */
-class NetworkStack: public DNS
+class NetworkStack: public DNS {
-{
 public:
     virtual ~NetworkStack() {};
 
@@ -162,7 +161,10 @@ public:
     virtual nsapi_error_t getstackopt(int level, int optname, void *optval, unsigned *optlen);
 
     /** Dynamic downcast to a OnboardNetworkStack */
-    virtual OnboardNetworkStack *onboardNetworkStack() { return 0; }
+    virtual OnboardNetworkStack *onboardNetworkStack()
+    {
+        return 0;
+    }
 
 protected:
     friend class InternetSocket;
@@ -247,7 +249,7 @@ protected:
      *  @return         0 on success, negative error code on failure
      */
     virtual nsapi_error_t socket_accept(nsapi_socket_t server,
-            nsapi_socket_t *handle, SocketAddress *address=0) = 0;
+                                        nsapi_socket_t *handle, SocketAddress *address = 0) = 0;
 
     /** Send data over a TCP socket
      *

features/netsocket/SocketAddress.cpp

@@ -35,7 +35,7 @@ static bool ipv4_is_valid(const char *addr)
     }
 
     // Ending with '.' garuntees host
-    if (i > 0 && addr[i-1] == '.') {
+    if (i > 0 && addr[i - 1] == '.') {
         return false;
     }
 

features/netsocket/TCPSocket.h

@@ -58,7 +58,10 @@ public:
     /** Override multicast functions to return error for TCP
      *
      */
-    virtual int join_multicast_group(const SocketAddress &address) { return NSAPI_ERROR_UNSUPPORTED; }
+    virtual int join_multicast_group(const SocketAddress &address)
+    {
+        return NSAPI_ERROR_UNSUPPORTED;
+    }
 
     /** Connects TCP socket to a remote host
      *

features/netsocket/UDPSocket.cpp

@@ -97,8 +97,9 @@ nsapi_size_or_error_t UDPSocket::sendto(const SocketAddress &address, const void
 
 nsapi_size_or_error_t UDPSocket::send(const void *data, nsapi_size_t size)
 {
-    if (!_remote_peer)
+    if (!_remote_peer) {
         return NSAPI_ERROR_NO_ADDRESS;
+    }
     return sendto(_remote_peer, data, size);
 }
 

features/netsocket/WiFiAccessPoint.h

@@ -25,8 +25,7 @@
  *  Class that represents a WiFi Access Point
  *  Common interface that is shared between WiFi devices
  */
-class WiFiAccessPoint
+class WiFiAccessPoint {
-{
     /** WiFiAccessPoint lifetime
      */
 public:

features/netsocket/WiFiInterface.h

@@ -27,8 +27,7 @@
  *  Common interface that is shared between WiFi devices
  *  @addtogroup netsocket
  */
-class WiFiInterface: public virtual NetworkInterface
+class WiFiInterface: public virtual NetworkInterface {
-{
 public:
     /** Get the default WiFi interface.
      *
@@ -106,7 +105,8 @@ public:
      */
     virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, nsapi_size_t count) = 0;
 
-    virtual WiFiInterface *wifiInterface() {
+    virtual WiFiInterface *wifiInterface()
+    {
         return this;
     }
 

features/netsocket/nsapi_dns.cpp

@@ -101,6 +101,7 @@ static void nsapi_dns_query_async_socket_callback_handle(NetworkStack *stack);
 static void nsapi_dns_query_async_response(void *ptr);
 static void nsapi_dns_query_async_initiate_next(void);
 
+// *INDENT-OFF*
 static nsapi_addr_t dns_servers[DNS_SERVERS_SIZE] = {
     {NSAPI_IPv4, {8, 8, 8, 8}},                             // Google
     {NSAPI_IPv4, {209, 244, 0, 3}},                         // Level 3
@@ -110,6 +111,7 @@ static nsapi_addr_t dns_servers[DNS_SERVERS_SIZE] = {
     {NSAPI_IPv6, {0x20,0x01, 0x16,0x08, 0,0x10, 0,0x25,     // DNS.WATCH
                   0,0, 0,0, 0x1c,0x04, 0xb1,0x2f}},
 };
+// *INDENT-ON*
 
 #if (MBED_CONF_NSAPI_DNS_CACHE_SIZE > 0)
 static DNS_CACHE *dns_cache[MBED_CONF_NSAPI_DNS_CACHE_SIZE];
@@ -129,7 +131,7 @@ static bool dns_timer_running = false;
 extern "C" nsapi_error_t nsapi_dns_add_server(nsapi_addr_t addr)
 {
     memmove(&dns_servers[1], &dns_servers[0],
-            (DNS_SERVERS_SIZE-1)*sizeof(nsapi_addr_t));
+            (DNS_SERVERS_SIZE - 1)*sizeof(nsapi_addr_t));
 
     dns_servers[0] = addr;
     return NSAPI_ERROR_OK;
@@ -454,7 +456,7 @@ static nsapi_size_or_error_t nsapi_dns_query_multiple(NetworkStack *stack, const
     socket.set_timeout(MBED_CONF_NSAPI_DNS_RESPONSE_WAIT_TIME);
 
     // create network packet
-    uint8_t * const packet = (uint8_t *)malloc(DNS_BUFFER_SIZE);
+    uint8_t *const packet = (uint8_t *)malloc(DNS_BUFFER_SIZE);
     if (!packet) {
         return NSAPI_ERROR_NO_MEMORY;
     }

features/netsocket/nsapi_ppp.h

@@ -47,7 +47,7 @@ nsapi_error_t nsapi_ppp_set_blocking(bool blocking);
  *
  *  @return             0 on success, negative error code on failure
  */
-nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_event_t, intptr_t)> status_cb=0, const char *uname=0, const char *pwd=0, const nsapi_ip_stack_t stack=DEFAULT_STACK);
+nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_event_t, intptr_t)> status_cb = 0, const char *uname = 0, const char *pwd = 0, const nsapi_ip_stack_t stack = DEFAULT_STACK);
 
 /** Close a PPP connection
  *

features/netsocket/nsapi_types.h

@@ -64,7 +64,7 @@ enum nsapi_error {
  *
  *  @enum nsapi_connection_status
  */
- typedef enum nsapi_connection_status {
+typedef enum nsapi_connection_status {
     NSAPI_STATUS_LOCAL_UP           = 0,        /*!< local IP address set */
     NSAPI_STATUS_GLOBAL_UP          = 1,        /*!< global IP address set */
     NSAPI_STATUS_DISCONNECTED       = 2,        /*!< no connection to network */
@@ -79,7 +79,7 @@ enum nsapi_error {
  *
  *  @enum nsapi_event
  */
- typedef enum nsapi_event {
+typedef enum nsapi_event {
     NSAPI_EVENT_CONNECTION_STATUS_CHANGE = 0, /*!< network connection status has changed, the parameter = new status (nsapi_connection_status_t) */
     NSAPI_EVENT_CELLULAR_STATUS_BASE     = 0x1000,  /*!< Cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /features/cellular/framework/common/CellularCommon.h */
     NSAPI_EVENT_CELLULAR_STATUS_END      = 0x1FFF   /*!< cellular modem status has changed, See the enum values from enum cellular_connection_status_t in /features/cellular/framework/common/CellularCommon.h */
@@ -320,8 +320,7 @@ typedef struct nsapi_ip_mreq {
  *
  *  Unsupported operations can be left as null pointers.
  */
-typedef struct nsapi_stack_api
+typedef struct nsapi_stack_api {
-{
     /** Get the local IP address
      *
      *  @param stack    Stack handle