vim-patch:8.0.1753: fix various warnings #10639

vim-patch:8.0.1753: various warnings from a static analyser
Problem:    Various warnings from a static analyser
Solution:   Remove unneeded conditions.
https://github.com/vim/vim/commit/1c17ffa4611f4efe68c61f7cdd9ed692a866ba75

2 files changed, 10 insertions, 10 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index cd447d3e0f..6931c5e4fb 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15175,15 +15175,15 @@ static void set_buffer_lines(buf_T *buf, linenr_T lnum, typval_T *lines,
     }
 
     rettv->vval.v_number = 1;  // FAIL
-    if (line == NULL || lnum < 1 || lnum > curbuf->b_ml.ml_line_count + 1) {
+    if (line == NULL || lnum > curbuf->b_ml.ml_line_count + 1) {
       break;
     }
 
-    /* When coming here from Insert mode, sync undo, so that this can be
-     * undone separately from what was previously inserted. */
+    // When coming here from Insert mode, sync undo, so that this can be
+    // undone separately from what was previously inserted.
     if (u_sync_once == 2) {
-      u_sync_once = 1;       /* notify that u_sync() was called */
-      u_sync(TRUE);
+      u_sync_once = 1;  // notify that u_sync() was called
+      u_sync(true);
     }
 
     if (lnum <= curbuf->b_ml.ml_line_count) {
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index e1aea25409..1a311a109f 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -3448,7 +3448,7 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
 {
   mapblock_T  *mp;
   int hash;
-  bool expand_buffer = false;
+  bool exp_buffer = false;
 
   validate_maphash();
 
@@ -3459,12 +3459,12 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
         if (hash > 0) {  // There is only one abbr list.
           break;
         }
-        if (expand_buffer) {
+        if (exp_buffer) {
           mp = curbuf->b_first_abbr;
         } else {
           mp = first_abbr;
         }
-      } else if (expand_buffer) {
+      } else if (exp_buffer) {
         mp = curbuf->b_maphash[hash];
       } else {
         mp = maphash[hash];
@@ -3476,10 +3476,10 @@ int map_to_exists_mode(const char *const rhs, const int mode, const bool abbr)
         }
       }
     }
-    if (expand_buffer) {
+    if (exp_buffer) {
       break;
     }
-    expand_buffer = true;
+    exp_buffer = true;
   }
 
   return false;