neovim

commit 65f585ce9b68b7d16e8efd70c3c05d453359c1e0
parent e75ccc3b3ac7e827d9e7a5661fa34365b32f629f
Author: Dundar Goc <gocdundar@gmail.com>
Date:   Tue, 17 May 2022 13:44:54 +0200

fix(PVS/V547): "expression is always false"

Suppress warning in loop.c, the expression can be true if EXITFREE isn't
defined.

Diffstat:
M
src/nvim/event/loop.c
 | 
2
+-
M
src/nvim/ex_docmd.c
 | 
13
++++++-------

2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/nvim/event/loop.c b/src/nvim/event/loop.c
@@ -143,7 +143,7 @@ bool loop_close(Loop *loop, bool wait)
   while (true) {
     // Run the loop to tickle close-callbacks (which should then free memory).
     // Use UV_RUN_NOWAIT to avoid a hang. #11820
-    uv_run(&loop->uv, didstop ? UV_RUN_DEFAULT : UV_RUN_NOWAIT);
+    uv_run(&loop->uv, didstop ? UV_RUN_DEFAULT : UV_RUN_NOWAIT);  // -V547
     if ((uv_loop_close(&loop->uv) != UV_EBUSY) || !wait) {
       break;
     }
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -1683,14 +1683,13 @@ void execute_cmd(exarg_T *eap, CmdParseInfo *cmdinfo)
                                    (eap->argt & EX_BUFUNL) != 0, false, false);
       eap->addr_count = 1;
       // Shift each argument by 1
-      if (eap->args != NULL) {
-        for (size_t i = 0; i < eap->argc - 1; i++) {
-          eap->args[i] = eap->args[i + 1];
-        }
-        // Make the last argument point to the NUL terminator at the end of string
-        eap->args[eap->argc - 1] = eap->args[eap->argc - 1] + eap->arglens[eap->argc - 1];
-        eap->argc -= 1;
+      for (size_t i = 0; i < eap->argc - 1; i++) {
+        eap->args[i] = eap->args[i + 1];
       }
+      // Make the last argument point to the NUL terminator at the end of string
+      eap->args[eap->argc - 1] = eap->args[eap->argc - 1] + eap->arglens[eap->argc - 1];
+      eap->argc -= 1;
+
       eap->arg = eap->args[0];
     }
     if (eap->line2 < 0) {  // failed