Explorar el Código

modify net error handler

宋超 hace 4 años
padre
commit
937ca37da6
Se han modificado 1 ficheros con 6 adiciones y 18 borrados
  1. 6 18
      components/net/sal_socket/dfs_net/dfs_net.c

+ 6 - 18
components/net/sal_socket/dfs_net/dfs_net.c

@@ -36,16 +36,12 @@ static int dfs_net_ioctl(struct dfs_fd* file, int cmd, void* args)
 {
 {
     int ret;
     int ret;
     int socket = (int)(size_t)file->fnode->data;
     int socket = (int)(size_t)file->fnode->data;
-    int errno_temp;
 
 
     ret = sal_ioctlsocket(socket, cmd, args);
     ret = sal_ioctlsocket(socket, cmd, args);
     if (ret < 0)
     if (ret < 0)
     {
     {
-        errno_temp = rt_get_errno();
-        if(errno_temp > 0)
-        {
-            ret = -errno_temp;
-        }
+        ret = rt_get_errno();
+        return (ret > 0) ? (-ret) : ret;
     }
     }
     return ret;
     return ret;
 }
 }
@@ -54,16 +50,12 @@ static int dfs_net_read(struct dfs_fd* file, void *buf, size_t count)
 {
 {
     int ret;
     int ret;
     int socket = (int)(size_t)file->fnode->data;
     int socket = (int)(size_t)file->fnode->data;
-    int errno_temp;
 
 
     ret = sal_recvfrom(socket, buf, count, 0, NULL, NULL);
     ret = sal_recvfrom(socket, buf, count, 0, NULL, NULL);
     if (ret < 0)
     if (ret < 0)
     {
     {
-        errno_temp = rt_get_errno();
-        if(errno_temp > 0)
-        {
-            ret = -errno_temp;
-        }
+        ret = rt_get_errno();
+        return (ret > 0) ? (-ret) : ret;
     }
     }
     return ret;
     return ret;
 }
 }
@@ -72,16 +64,12 @@ static int dfs_net_write(struct dfs_fd *file, const void *buf, size_t count)
 {
 {
     int ret;
     int ret;
     int socket = (int)(size_t)file->fnode->data;
     int socket = (int)(size_t)file->fnode->data;
-    int errno_temp;
     
     
     ret = sal_sendto(socket, buf, count, 0, NULL, 0);
     ret = sal_sendto(socket, buf, count, 0, NULL, 0);
     if (ret < 0)
     if (ret < 0)
     {
     {
-        errno_temp = rt_get_errno();
-        if(errno_temp > 0)
-        {
-            ret = -errno_temp;
-        }
+        ret = rt_get_errno();
+        return (ret > 0) ? (-ret) : ret;
     }
     }
     return ret;
     return ret;
 }
 }