Sfoglia il codice sorgente

Merge pull request #4 from misonyo/master

astyle codes
yqiu 7 anni fa
parent
commit
d23f9acb27
6 ha cambiato i file con 105 aggiunte e 105 eliminazioni
  1. 12 12
      httpclient_sample.c
  2. 7 7
      tcpclient_sample.c
  3. 64 64
      tcpclient_select_sample.c
  4. 7 7
      tcpserver_sample.c
  5. 8 8
      udpclient_sample.c
  6. 7 7
      udpserver_sample.c

+ 12 - 12
httpclient_sample.c

@@ -1,11 +1,11 @@
-/* 
+/*
  * File      : httpclient.c
  *
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
  * 2018-07-20     flybreak     first version
  * 2018-09-05     flybreak     Upgrade API to webclient latest version
@@ -96,7 +96,7 @@ void weather(int argc, char **argv)
 
     /* 分配用于存放接收数据的缓冲 */
     buffer = rt_calloc(1, GET_RESP_BUFSZ);
-    if(buffer == RT_NULL)
+    if (buffer == RT_NULL)
     {
         rt_kprintf("No memory for data receive buffer!\n");
         goto __exit;
@@ -113,21 +113,21 @@ void weather(int argc, char **argv)
             {
                 break;
             }
-        } while (1);
+        }while (1);
     }
     else
     {
         do
         {
-            bytes_read = webclient_read(session, buffer, 
-                    content_length - content_pos > GET_RESP_BUFSZ ?
-                            GET_RESP_BUFSZ : content_length - content_pos);
+            bytes_read = webclient_read(session, buffer,
+                                        content_length - content_pos > GET_RESP_BUFSZ ?
+                                        GET_RESP_BUFSZ : content_length - content_pos);
             if (bytes_read <= 0)
             {
                 break;
             }
             content_pos += bytes_read;
-        } while (content_pos < content_length);
+        }while (content_pos < content_length);
     }
 
     /* 天气数据解析 */

+ 7 - 7
tcpclient_sample.c

@@ -1,11 +1,11 @@
-/* 
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
- * 
+ *
  */
 /*
  * 程序清单:tcp 客户端

+ 64 - 64
tcpclient_select_sample.c

@@ -1,11 +1,11 @@
-/* 
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
- * 
+ *
  */
 /* 程序清单:利用 select 实现的 tcp 客户端
  *
@@ -110,63 +110,63 @@ void tcpclient_select(int argc, char **argv)
         if (FD_ISSET(sock, &readset))
         {
             /* 从sock连接中接收最大BUFSZ - 1字节数据 */
-           bytes_received = recv(sock, recv_data, BUFSZ - 1, 0);
-           if (bytes_received < 0)
-           {
-               /* 接收失败,关闭这个连接 */
-               closesocket(sock);
-               rt_kprintf("\nreceived error,close the socket.\r\n");
-
-               /* 释放接收缓冲 */
-               rt_free(recv_data);
-               break;
-           }
-           else if (bytes_received == 0)
-           {
-               /* 默认 recv 为阻塞模式,此时收到0认为连接出错,关闭这个连接 */
-               closesocket(sock);
-               rt_kprintf("\nreceived error,close the socket.\r\n");
-
-               /* 释放接收缓冲 */
-               rt_free(recv_data);
-               break;
-           }
-
-           /* 有接收到数据,把末端清零 */
-           recv_data[bytes_received] = '\0';
-
-           if (strncmp(recv_data, "q", 1) == 0 || strncmp(recv_data, "Q", 1) == 0)
-           {
-               /* 如果是首字母是q或Q,关闭这个连接 */
-               closesocket(sock);
-               rt_kprintf("\n got a 'q' or 'Q',close the socket.\r\n");
-
-               /* 释放接收缓冲 */
-               rt_free(recv_data);
-               break;
-           }
-           else
-           {
-               /* 在控制终端显示收到的数据 */
-               rt_kprintf("\nReceived data = %s ", recv_data);
-           }
-
-           /* 发送数据到sock连接 */
-           ret = send(sock, send_data, strlen(send_data), 0);
-           if (ret < 0)
-           {
-               /* 接收失败,关闭这个连接 */
-               closesocket(sock);
-               rt_kprintf("\nsend error,close the socket.\r\n");
-
-               rt_free(recv_data);
-               break;
-           }
-           else if (ret == 0)
-           {
-               /* 打印send函数返回值为0的警告信息 */
-               rt_kprintf("\n Send warning,send function return 0.\r\n");
-           }
+            bytes_received = recv(sock, recv_data, BUFSZ - 1, 0);
+            if (bytes_received < 0)
+            {
+                /* 接收失败,关闭这个连接 */
+                closesocket(sock);
+                rt_kprintf("\nreceived error,close the socket.\r\n");
+
+                /* 释放接收缓冲 */
+                rt_free(recv_data);
+                break;
+            }
+            else if (bytes_received == 0)
+            {
+                /* 默认 recv 为阻塞模式,此时收到0认为连接出错,关闭这个连接 */
+                closesocket(sock);
+                rt_kprintf("\nreceived error,close the socket.\r\n");
+
+                /* 释放接收缓冲 */
+                rt_free(recv_data);
+                break;
+            }
+
+            /* 有接收到数据,把末端清零 */
+            recv_data[bytes_received] = '\0';
+
+            if (strncmp(recv_data, "q", 1) == 0 || strncmp(recv_data, "Q", 1) == 0)
+            {
+                /* 如果是首字母是q或Q,关闭这个连接 */
+                closesocket(sock);
+                rt_kprintf("\n got a 'q' or 'Q',close the socket.\r\n");
+
+                /* 释放接收缓冲 */
+                rt_free(recv_data);
+                break;
+            }
+            else
+            {
+                /* 在控制终端显示收到的数据 */
+                rt_kprintf("\nReceived data = %s ", recv_data);
+            }
+
+            /* 发送数据到sock连接 */
+            ret = send(sock, send_data, strlen(send_data), 0);
+            if (ret < 0)
+            {
+                /* 接收失败,关闭这个连接 */
+                closesocket(sock);
+                rt_kprintf("\nsend error,close the socket.\r\n");
+
+                rt_free(recv_data);
+                break;
+            }
+            else if (ret == 0)
+            {
+                /* 打印send函数返回值为0的警告信息 */
+                rt_kprintf("\n Send warning,send function return 0.\r\n");
+            }
         }
     }
     return;

+ 7 - 7
tcpserver_sample.c

@@ -1,11 +1,11 @@
-/* 
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
- * 
+ *
  */
 /*
 * 程序清单:tcp 服务端

+ 8 - 8
udpclient_sample.c

@@ -1,11 +1,11 @@
-/* 
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
- * 
+ *
  */
 /*
  * 程序清单:udp 客户端
@@ -13,7 +13,7 @@
  * 这是一个 udp 客户端的例程
  * 导出 udpclient 命令到控制终端
  * 命令调用格式:udpclient URL PORT [COUNT = 10]
- * URL:服务器地址  PORT:端口号  COUNT:可选参数 默认为 10 
+ * URL:服务器地址  PORT:端口号  COUNT:可选参数 默认为 10
  * 程序功能:发送 COUNT 条数据到服务远端
 */
 #include <rtthread.h>

+ 7 - 7
udpserver_sample.c

@@ -1,11 +1,11 @@
-/* 
- * Copyright (c) 2006-2018, RT-Thread Development Team 
- * 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * Change Logs: 
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
  * Date             Author      Notes
- * 
+ *
  */
 /*
 * 程序清单:udp 服务端