You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/02/21 17:42:23 UTC

[nuttx] 01/02: usrsock: Add DebugAssert for poll setup result

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 9d53de374c2df530b79cba1d2eec6cc7ec6eccaa
Author: Zhe Weng <we...@xiaomi.com>
AuthorDate: Fri Feb 17 14:58:18 2023 +0800

    usrsock: Add DebugAssert for poll setup result
    
    We never check its result and assume it will success, so an assert should be better than retval.
    
    Signed-off-by: Zhe Weng <we...@xiaomi.com>
---
 drivers/usrsock/usrsock_rpmsg_server.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usrsock/usrsock_rpmsg_server.c b/drivers/usrsock/usrsock_rpmsg_server.c
index d8e6270a9e..6f4b161325 100644
--- a/drivers/usrsock/usrsock_rpmsg_server.c
+++ b/drivers/usrsock/usrsock_rpmsg_server.c
@@ -129,8 +129,8 @@ static int usrsock_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept,
                                 FAR void *priv);
 
 static void usrsock_rpmsg_poll_cb(FAR struct pollfd *pfds);
-static int usrsock_rpmsg_poll_setup(FAR struct pollfd *pfds,
-                                    pollevent_t events);
+static void usrsock_rpmsg_poll_setup(FAR struct pollfd *pfds,
+                                     pollevent_t events);
 
 /****************************************************************************
  * Private Data
@@ -1021,8 +1021,8 @@ static int usrsock_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept,
   return -EINVAL;
 }
 
-static int usrsock_rpmsg_poll_setup(FAR struct pollfd *pfds,
-                                    pollevent_t events)
+static void usrsock_rpmsg_poll_setup(FAR struct pollfd *pfds,
+                                     pollevent_t events)
 {
   FAR struct usrsock_rpmsg_s *priv = (FAR struct usrsock_rpmsg_s *)pfds->arg;
   int ret = 0;
@@ -1050,7 +1050,7 @@ static int usrsock_rpmsg_poll_setup(FAR struct pollfd *pfds,
 
   net_unlock();
 
-  return ret;
+  DEBUGASSERT(ret >= 0);
 }
 
 static void usrsock_rpmsg_poll_cb(FAR struct pollfd *pfds)