summaryrefslogtreecommitdiff
path: root/components/net/at
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2021-05-28 16:20:08 +0800
committerGitHub <[email protected]>2021-05-28 16:20:08 +0800
commit92beddf3bccf6346e26aa097f82464456fb8e6bd (patch)
tree197e4a108118dda016ea02274172f0c40e7ee8ed /components/net/at
parentb18a99b44240ec3152011e159cc24a5af8dff0ce (diff)
parent03f4d40e30f3c94e1db0b3a65b3610dee695694a (diff)
Merge pull request #4737 from mysterywolf/3,1,xformatv3.1.5
[lts 3.1.x] format codes
Diffstat (limited to 'components/net/at')
-rw-r--r--components/net/at/at_socket/at_socket.c40
-rw-r--r--components/net/at/at_socket/at_socket.h2
-rw-r--r--components/net/at/include/at.h2
-rw-r--r--components/net/at/include/at_log.h2
-rw-r--r--components/net/at/src/at_base_cmd.c2
-rw-r--r--components/net/at/src/at_cli.c4
-rw-r--r--components/net/at/src/at_client.c4
-rw-r--r--components/net/at/src/at_server.c2
-rw-r--r--components/net/at/src/at_utils.c2
9 files changed, 30 insertions, 30 deletions
diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c
index ce8559f129..6d4c040856 100644
--- a/components/net/at/at_socket/at_socket.c
+++ b/components/net/at/at_socket/at_socket.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -70,8 +70,8 @@ struct at_socket *at_get_socket(int socket)
return at_sock;
}
}
- }
-
+ }
+
rt_hw_interrupt_enable(level);
return RT_NULL;
@@ -289,7 +289,7 @@ static int alloc_empty_socket(rt_slist_t *l)
rt_slist_for_each(node, &_socket_list)
{
at_sock = rt_slist_entry(node, struct at_socket, list);
- if(at_sock->socket != idx)
+ if(at_sock->socket != idx)
break;
idx++;
pre_node = node;
@@ -337,7 +337,7 @@ static struct at_socket *alloc_socket_by_device(struct at_device *device, enum a
{
goto __err;
}
-
+
sock = &(device->sockets[idx]);
/* the socket descriptor is the number of sockte lists */
sock->socket = alloc_empty_socket(&(sock->list));
@@ -508,7 +508,7 @@ int at_closesocket(int socket)
/* deal with TCP server actively disconnect */
rt_thread_delay(rt_tick_from_millisecond(100));
-
+
sock = at_get_socket(socket);
if (sock == RT_NULL)
{
@@ -529,7 +529,7 @@ int at_closesocket(int socket)
}
}
- free_socket(sock);
+ free_socket(sock);
return 0;
}
@@ -603,7 +603,7 @@ int at_bind(int socket, const struct sockaddr *name, socklen_t namelen)
/* input ip address is different from device ip address */
if (ip_addr_cmp(&input_ipaddr, &local_ipaddr) == 0)
- {
+ {
struct at_socket *new_sock = RT_NULL;
struct at_device *new_device = RT_NULL;
enum at_socket_type type = sock->type;
@@ -613,7 +613,7 @@ int at_bind(int socket, const struct sockaddr *name, socklen_t namelen)
{
return -1;
}
-
+
extern struct at_device *at_device_get_by_ipaddr(ip_addr_t *ip_addr);
new_device = at_device_get_by_ipaddr(&input_ipaddr);
if (new_device == RT_NULL)
@@ -649,7 +649,7 @@ static void at_recv_notice_cb(struct at_socket *sock, at_socket_evt_t event, con
{
RT_ASSERT(buff);
RT_ASSERT(event == AT_SOCKET_EVT_RECV);
-
+
/* check the socket object status */
if (sock->magic != AT_SOCKET_MAGIC)
{
@@ -675,7 +675,7 @@ static void at_closed_notice_cb(struct at_socket *sock, at_socket_evt_t event, c
{
return;
}
-
+
at_do_event_changes(sock, AT_EVENT_RECV, RT_TRUE);
at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
@@ -731,7 +731,7 @@ __exit:
{
at_do_event_changes(sock, AT_EVENT_SEND, RT_TRUE);
}
-
+
return result;
}
@@ -780,7 +780,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
goto __exit;
}
rt_mutex_release(sock->recv_lock);
-
+
/* socket passively closed, receive function return 0 */
if (sock->state == AT_SOCKET_CLOSED)
{
@@ -821,7 +821,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
goto __exit;
}
else
- {
+ {
/* get receive buffer to receiver ring buffer */
rt_mutex_take(sock->recv_lock, RT_WAITING_FOREVER);
@@ -945,7 +945,7 @@ __exit:
{
if (sock != RT_NULL)
{
- at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
+ at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
}
}
else
@@ -1138,13 +1138,13 @@ struct hostent *at_gethostbyname(const char *name)
#if NETDEV_IPV4 && NETDEV_IPV6
addr.u_addr.ip4.addr = ipstr_to_u32(ipstr);
- addr.type = IPADDR_TYPE_V4;
+ addr.type = IPADDR_TYPE_V4;
#elif NETDEV_IPV4
addr.addr = ipstr_to_u32(ipstr);
#elif NETDEV_IPV6
#error "not support IPV6."
#endif /* NETDEV_IPV4 && NETDEV_IPV6 */
-
+
/* fill hostent structure */
s_hostent_addr = addr;
s_phostent_addr[0] = &s_hostent_addr;
@@ -1243,8 +1243,8 @@ int at_getaddrinfo(const char *nodename, const char *servname,
{
strncpy(ip_str, nodename, strlen(nodename));
}
-
- #if NETDEV_IPV4 && NETDEV_IPV6
+
+ #if NETDEV_IPV4 && NETDEV_IPV6
addr.type = IPADDR_TYPE_V4;
if ((addr.u_addr.ip4.addr = ipstr_to_u32(ip_str)) == 0)
{
@@ -1254,7 +1254,7 @@ int at_getaddrinfo(const char *nodename, const char *servname,
addr.addr = ipstr_to_u32(ip_str);
#elif NETDEV_IPV6
#error "not support IPV6."
- #endif /* NETDEV_IPV4 && NETDEV_IPV6 */
+ #endif /* NETDEV_IPV4 && NETDEV_IPV6 */
}
}
else
diff --git a/components/net/at/at_socket/at_socket.h b/components/net/at/at_socket/at_socket.h
index 3317579f05..caac6d2d5d 100644
--- a/components/net/at/at_socket/at_socket.h
+++ b/components/net/at/at_socket/at_socket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h
index 2d0e270f6a..7d9de6b353 100644
--- a/components/net/at/include/at.h
+++ b/components/net/at/include/at.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/include/at_log.h b/components/net/at/include/at_log.h
index 9e133561f7..acb5b34ecc 100644
--- a/components/net/at/include/at_log.h
+++ b/components/net/at/include/at_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_base_cmd.c b/components/net/at/src/at_base_cmd.c
index b182477f9b..00720c87b2 100644
--- a/components/net/at/src/at_base_cmd.c
+++ b/components/net/at/src/at_base_cmd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_cli.c b/components/net/at/src/at_cli.c
index e39a913357..25fbb708f4 100644
--- a/components/net/at/src/at_cli.c
+++ b/components/net/at/src/at_cli.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -27,7 +27,7 @@ static rt_err_t (*odev_rx_ind)(rt_device_t dev, rt_size_t size) = RT_NULL;
#ifdef AT_USING_CLIENT
static struct rt_semaphore client_rx_notice;
static struct rt_ringbuffer *client_rx_fifo = RT_NULL;
-#endif
+#endif
static char console_getchar(void)
{
diff --git a/components/net/at/src/at_client.c b/components/net/at/src/at_client.c
index b9d0ee89cb..d636460c2d 100644
--- a/components/net/at/src/at_client.c
+++ b/components/net/at/src/at_client.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -579,7 +579,7 @@ int at_obj_set_urc_table(at_client_t client, const struct at_urc *urc_table, rt_
client->urc_table[client->urc_table_size].urc = urc_table;
client->urc_table[client->urc_table_size].urc_size = table_sz;
client->urc_table_size++;
-
+
rt_free(old_urc_table);
}
diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c
index 81d00951f5..bfbbbae2d3 100644
--- a/components/net/at/src/at_server.c
+++ b/components/net/at/src/at_server.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/net/at/src/at_utils.c b/components/net/at/src/at_utils.c
index 7d26425f56..8d8887fe5e 100644
--- a/components/net/at/src/at_utils.c
+++ b/components/net/at/src/at_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*