nanostack interface: fix coding style

0xc0170 · 0xc0170 · commit eec4e1329ab9 · 2018-11-15T07:20:12.000Z
diff --git a/features/nanostack/nanostack-interface/Nanostack.cpp b/features/nanostack/nanostack-interface/Nanostack.cpp
@@ -61,15 +61,18 @@ enum socket_mode_t {
 class NanostackSocket {
 public:
     static void socket_callback(void *cb);
-    static void* operator new(std::size_t sz);
-    static void operator delete(void* ptr);
+    static void *operator new (std::size_t sz);
+    static void operator delete (void *ptr);
 
     NanostackSocket(int8_t protocol);
     ~NanostackSocket(void);
     bool open(void);
     int accept(NanostackSocket *accepted_socket, ns_address_t *addr);
     void close(void);
-    bool closed(void) {return SOCKET_MODE_CLOSED == mode;}
+    bool closed(void)
+    {
+        return SOCKET_MODE_CLOSED == mode;
+    }
     bool is_connecting(void);
     void set_connecting(ns_address_t *addr);
     bool is_connected(void);
@@ -101,21 +104,26 @@ class NanostackSocket {
     socket_mode_t mode;
 };
 
-static NanostackSocket * socket_tbl[NS_INTERFACE_SOCKETS_MAX];
+static NanostackSocket *socket_tbl[NS_INTERFACE_SOCKETS_MAX];
 
 nsapi_error_t map_mesh_error(mesh_error_t err)
 {
     switch (err) {
-        case MESH_ERROR_NONE: return 0;
-        case MESH_ERROR_MEMORY: return NSAPI_ERROR_NO_MEMORY;
-        case MESH_ERROR_PARAM: return NSAPI_ERROR_UNSUPPORTED;
-        case MESH_ERROR_STATE: return NSAPI_ERROR_DEVICE_ERROR;
-        default: return NSAPI_ERROR_DEVICE_ERROR;
+        case MESH_ERROR_NONE:
+            return 0;
+        case MESH_ERROR_MEMORY:
+            return NSAPI_ERROR_NO_MEMORY;
+        case MESH_ERROR_PARAM:
+            return NSAPI_ERROR_UNSUPPORTED;
+        case MESH_ERROR_STATE:
+            return NSAPI_ERROR_DEVICE_ERROR;
+        default:
+            return NSAPI_ERROR_DEVICE_ERROR;
     }
 }
 
 static void convert_mbed_addr_to_ns(ns_address_t *ns_addr,
-                             const SocketAddress *s_addr)
+                                    const SocketAddress *s_addr)
 {
     ns_addr->type = ADDRESS_IPV6;
     ns_addr->identifier = s_addr->get_port();
@@ -142,10 +150,12 @@ static int8_t find_interface_by_address(const uint8_t target_addr[16])
     return -1;
 }
 
-void* NanostackSocket::operator new(std::size_t sz) {
+void *NanostackSocket::operator new (std::size_t sz)
+{
     return MALLOC(sz);
 }
-void NanostackSocket::operator delete(void* ptr) {
+void NanostackSocket::operator delete (void *ptr)
+{
     FREE(ptr);
 }
 
@@ -296,15 +306,16 @@ void NanostackSocket::signal_event()
     }
 }
 
-void NanostackSocket::socket_callback(void *cb) {
+void NanostackSocket::socket_callback(void *cb)
+{
     nanostack_assert_locked();
 
     socket_callback_t *sock_cb = (socket_callback_t *) cb;
     NanostackSocket *socket = socket_tbl[sock_cb->socket_id];
     MBED_ASSERT(socket != NULL);
 
     tr_debug("socket_callback() sock=%d, event=%d, interface=%d, data len=%d",
-                     sock_cb->socket_id, sock_cb->event_type, sock_cb->interface_id, sock_cb->d_len);
+             sock_cb->socket_id, sock_cb->event_type, sock_cb->interface_id, sock_cb->d_len);
 
     switch (sock_cb->event_type) {
         case SOCKET_DATA:
@@ -506,7 +517,7 @@ Nanostack::call_in_callback_cb_t Nanostack::get_call_in_callback()
     return cb;
 }
 
-const char * Nanostack::get_ip_address()
+const char *Nanostack::get_ip_address()
 {
     NanostackLockGuard lock;
 
@@ -539,11 +550,11 @@ nsapi_error_t Nanostack::socket_open(void **handle, nsapi_protocol_t protocol)
         MBED_ASSERT(false);
         return NSAPI_ERROR_UNSUPPORTED;
     }
-    *handle = (void*)NULL;
+    *handle = (void *)NULL;
 
     NanostackLockGuard lock;
 
-    NanostackSocket * socket = new NanostackSocket(ns_proto);
+    NanostackSocket *socket = new NanostackSocket(ns_proto);
     if (socket == NULL) {
         tr_debug("socket_open() ret=%i", NSAPI_ERROR_NO_MEMORY);
         return NSAPI_ERROR_NO_MEMORY;
@@ -553,7 +564,7 @@ nsapi_error_t Nanostack::socket_open(void **handle, nsapi_protocol_t protocol)
         tr_debug("socket_open() ret=%i", NSAPI_ERROR_NO_MEMORY);
         return NSAPI_ERROR_NO_MEMORY;
     }
-    *handle = (void*)socket;
+    *handle = (void *)socket;
 
     tr_debug("socket_open() socket=%p, sock_id=%d, ret=0", socket, socket->socket_id);
 
@@ -564,7 +575,7 @@ nsapi_error_t Nanostack::socket_close(void *handle)
 {
     NanostackLockGuard lock;
     // Validate parameters
-    NanostackSocket * socket = static_cast<NanostackSocket *>(handle);
+    NanostackSocket *socket = static_cast<NanostackSocket *>(handle);
     if (NULL == handle) {
         MBED_ASSERT(false);
         return NSAPI_ERROR_NO_SOCKET;
@@ -580,7 +591,7 @@ nsapi_error_t Nanostack::socket_close(void *handle)
 nsapi_size_or_error_t Nanostack::do_sendto(void *handle, const ns_address_t *address, const void *data, nsapi_size_t size)
 {
     // Validate parameters
-    NanostackSocket * socket = static_cast<NanostackSocket *>(handle);
+    NanostackSocket *socket = static_cast<NanostackSocket *>(handle);
     if (handle == NULL) {
         MBED_ASSERT(false);
         return NSAPI_ERROR_NO_SOCKET;
@@ -604,7 +615,7 @@ nsapi_size_or_error_t Nanostack::do_sendto(void *handle, const ns_address_t *add
     int retcode;
 #if 0
     retcode = ::socket_sendto(socket->socket_id, address,
-                                            data, size);
+                              data, size);
 #else
     // Use sendmsg purely to get the new return style
     // of returning data written rather than 0 on success,
@@ -616,7 +627,7 @@ nsapi_size_or_error_t Nanostack::do_sendto(void *handle, const ns_address_t *add
     iov.iov_base = const_cast<void *>(data);
     iov.iov_len = size;
     msg.msg_name = const_cast<ns_address_t *>(address);
-    msg.msg_namelen = address ? sizeof *address : 0;
+    msg.msg_namelen = address ? sizeof * address : 0;
     msg.msg_iov = &iov;
     msg.msg_iovlen = 1;
     msg.msg_control = NULL;
@@ -771,7 +782,7 @@ nsapi_error_t Nanostack::setsockopt(void *handle, int level, int optname, const
 
                 /* Check address types are IPv6, or unspecified for interface */
                 if (imr->imr_multiaddr.version != NSAPI_IPv6 ||
-                    (imr->imr_interface.version != NSAPI_UNSPEC && imr->imr_interface.version != NSAPI_IPv6)) {
+                        (imr->imr_interface.version != NSAPI_UNSPEC && imr->imr_interface.version != NSAPI_IPv6)) {
                     return NSAPI_ERROR_PARAMETER;
                 }
 
@@ -841,7 +852,7 @@ nsapi_error_t Nanostack::socket_listen(void *handle, int backlog)
 
     NanostackLockGuard lock;
 
-    if(::socket_listen(socket->socket_id, backlog) < 0) {
+    if (::socket_listen(socket->socket_id, backlog) < 0) {
         ret = NSAPI_ERROR_PARAMETER;
     } else {
         socket->set_listening();
@@ -904,7 +915,7 @@ nsapi_error_t Nanostack::socket_connect(void *handle, const SocketAddress &addr)
 
 nsapi_error_t Nanostack::socket_accept(void *server, void **handle, SocketAddress *address)
 {
-    NanostackSocket * socket = static_cast<NanostackSocket *>(server);
+    NanostackSocket *socket = static_cast<NanostackSocket *>(server);
     NanostackSocket *accepted_sock = NULL;
     nsapi_error_t ret;
 
@@ -965,7 +976,7 @@ nsapi_size_or_error_t Nanostack::socket_recv(void *handle, void *data, nsapi_siz
 void Nanostack::socket_attach(void *handle, void (*callback)(void *), void *id)
 {
     // Validate parameters
-    NanostackSocket * socket = static_cast<NanostackSocket *>(handle);
+    NanostackSocket *socket = static_cast<NanostackSocket *>(handle);
     if (handle == NULL) {
         MBED_ASSERT(false);
         return;
@@ -979,7 +990,8 @@ void Nanostack::socket_attach(void *handle, void (*callback)(void *), void *id)
     tr_debug("socket_attach(socket=%p) sock_id=%d", socket, socket->socket_id);
 }
 
-Nanostack &Nanostack::get_instance() {
+Nanostack &Nanostack::get_instance()
+{
     static Nanostack nanostack;
     return nanostack;
 }
@@ -989,7 +1001,8 @@ Nanostack &Nanostack::get_instance() {
 #define NANOSTACK 0x99119911
 #if MBED_CONF_NSAPI_DEFAULT_STACK == NANOSTACK
 #undef NANOSTACK
-OnboardNetworkStack &OnboardNetworkStack::get_default_instance() {
+OnboardNetworkStack &OnboardNetworkStack::get_default_instance()
+{
     return Nanostack::get_instance();
 }
 #endif
diff --git a/features/nanostack/nanostack-interface/NanostackLockGuard.h b/features/nanostack/nanostack-interface/NanostackLockGuard.h
@@ -27,17 +27,19 @@
 
 class NanostackLockGuard {
 public:
-    NanostackLockGuard() {
+    NanostackLockGuard()
+    {
         eventOS_scheduler_mutex_wait();
     }
 
-    ~NanostackLockGuard() {
+    ~NanostackLockGuard()
+    {
         eventOS_scheduler_mutex_release();
     }
 
 private:
-    NanostackLockGuard(const NanostackLockGuard&);
-    NanostackLockGuard& operator=(const NanostackLockGuard&);
+    NanostackLockGuard(const NanostackLockGuard &);
+    NanostackLockGuard &operator=(const NanostackLockGuard &);
 };
 
 #endif /* NANOSTACK_LOCK_GUARD_H_ */
diff --git a/features/nanostack/nanostack-interface/NanostackRfPhy.h b/features/nanostack/nanostack-interface/NanostackRfPhy.h
@@ -48,12 +48,18 @@ class NanostackRfPhy : public NanostackPhy {
      *  @return         Device driver ID or a negative error
      *                  code on failure
      */
-    virtual int8_t phy_register() { return rf_register();}
+    virtual int8_t phy_register()
+    {
+        return rf_register();
+    }
 
     /** Unregister this physical interface
      *
      */
-    virtual void unregister() { rf_unregister(); }
+    virtual void unregister()
+    {
+        rf_unregister();
+    }
 };
 
 #endif /* NANOSTACK_RF_PHY_H_ */
