Remove unnecessary (int) casts and fix style

3 files changed, 30 insertions, 34 deletions

diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
index adf0fa7120..312154ee2b 100644
--- a/src/nvim/misc2.c
+++ b/src/nvim/misc2.c
@@ -151,7 +151,6 @@ int decl(pos_T *lp)
 }
 
 /*
-
  * Return TRUE when 'shell' has "csh" in the tail.
  */
 int csh_like_shell(void)
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 77b06d703c..0a10def170 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1612,9 +1612,9 @@ static void win_update(win_T *wp)
        * Last line isn't finished: Display "@@@" at the end.
        */
       screen_fill(wp->w_winrow + wp->w_height - 1,
-          wp->w_winrow + wp->w_height,
-          (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp),
-          '@', '@', hl_attr(HLF_AT));
+                  wp->w_winrow + wp->w_height,
+                  (int)W_ENDCOL(wp) - 3, (int)W_ENDCOL(wp),
+                  '@', '@', hl_attr(HLF_AT));
       set_empty_rows(wp, srow);
       wp->w_botline = lnum;
     } else {
@@ -1706,8 +1706,8 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
       if (n > wp->w_width)
         n = wp->w_width;
       screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-          W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
-          ' ', ' ', hl_attr(HLF_FC));
+                  W_ENDCOL(wp) - n, (int)W_ENDCOL(wp),
+                  ' ', ' ', hl_attr(HLF_FC));
     }
 
     if (draw_signcolumn(wp)) {
@@ -1718,17 +1718,17 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
             nn = wp->w_width;
         }
         screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-                W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
-                ' ', ' ', hl_attr(HLF_SC));
+                    W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - n,
+                    ' ', ' ', hl_attr(HLF_SC));
         n = nn;
     }
 
     screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-        wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF,
-        c2, c2, hl_attr(hl));
+                wp->w_wincol, W_ENDCOL(wp) - 1 - FDC_OFF,
+                c2, c2, hl_attr(hl));
     screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-        W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF,
-        c1, c2, hl_attr(hl));
+                W_ENDCOL(wp) - 1 - FDC_OFF, W_ENDCOL(wp) - FDC_OFF,
+                c1, c2, hl_attr(hl));
   } else {
     if (cmdwin_type != 0 && wp == curwin) {
       /* draw the cmdline character in the leftmost column */
@@ -1736,8 +1736,8 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
       if (n > wp->w_width)
         n = wp->w_width;
       screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-          wp->w_wincol, (int)wp->w_wincol + n,
-          cmdwin_type, ' ', hl_attr(HLF_AT));
+                  wp->w_wincol, wp->w_wincol + n,
+                  cmdwin_type, ' ', hl_attr(HLF_AT));
     }
     if (wp->w_p_fdc > 0) {
       int nn = n + wp->w_p_fdc;
@@ -1746,8 +1746,8 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
       if (nn > wp->w_width)
         nn = wp->w_width;
       screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-          wp->w_wincol + n, (int)wp->w_wincol + nn,
-          ' ', ' ', hl_attr(HLF_FC));
+                  wp->w_wincol + n, wp->w_wincol + nn,
+                  ' ', ' ', hl_attr(HLF_FC));
       n = nn;
     }
 
@@ -1760,14 +1760,14 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
             nn = wp->w_width;
         }
         screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-                wp->w_wincol + n, (int)wp->w_wincol + nn,
-                ' ', ' ', hl_attr(HLF_SC));
+                    wp->w_wincol + n, wp->w_wincol + nn,
+                    ' ', ' ', hl_attr(HLF_SC));
         n = nn;
     }
 
     screen_fill(wp->w_winrow + row, wp->w_winrow + endrow,
-        wp->w_wincol + FDC_OFF, (int)W_ENDCOL(wp),
-        c1, c2, hl_attr(hl));
+                wp->w_wincol + FDC_OFF, (int)W_ENDCOL(wp),
+                c1, c2, hl_attr(hl));
   }
   set_empty_rows(wp, row);
 }
@@ -2083,8 +2083,8 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T
           ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
   }
 
-  SCREEN_LINE(row + wp->w_winrow, wp->w_wincol, (int)wp->w_width,
-      (int)wp->w_width, FALSE);
+  SCREEN_LINE(row + wp->w_winrow, wp->w_wincol, wp->w_width,
+              wp->w_width, FALSE);
 
   /*
    * Update w_cline_height and w_cline_folded if the cursor line was
@@ -2862,8 +2862,7 @@ win_line (
         && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol
         && filler_todo <= 0
         ) {
-      SCREEN_LINE(screen_row, wp->w_wincol, col, -(int)wp->w_width,
-          wp->w_p_rl);
+      SCREEN_LINE(screen_row, wp->w_wincol, col, -wp->w_width, wp->w_p_rl);
       /* Pretend we have finished updating the window.  Except when
        * 'cursorcolumn' is set. */
       if (wp->w_p_cuc)
@@ -3802,8 +3801,7 @@ win_line (
         }
       }
 
-      SCREEN_LINE(screen_row, wp->w_wincol, col,
-          (int)wp->w_width, wp->w_p_rl);
+      SCREEN_LINE(screen_row, wp->w_wincol, col, wp->w_width, wp->w_p_rl);
       row++;
 
       /*
@@ -4022,7 +4020,7 @@ win_line (
             || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL)))
         ) {
       SCREEN_LINE(screen_row, wp->w_wincol, col - boguscols,
-          (int)wp->w_width, wp->w_p_rl);
+                  wp->w_width, wp->w_p_rl);
       boguscols = 0;
       ++row;
       ++screen_row;
@@ -4876,8 +4874,8 @@ void win_redr_status(win_T *wp)
       fillchar = fillchar_status(&attr, wp == curwin);
     else
       fillchar = fillchar_vsep(&attr);
-    screen_putchar(fillchar, wp->w_winrow + wp->w_height, W_ENDCOL(wp),
-        attr);
+    screen_putchar(fillchar, wp->w_winrow + wp->w_height, 
+                   W_ENDCOL(wp), attr);
   }
   busy = FALSE;
 }
@@ -6766,8 +6764,8 @@ int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear)
     if (lastrow > Rows)
       lastrow = Rows;
     screen_fill(nextrow - line_count, lastrow - line_count,
-        wp->w_wincol, (int)W_ENDCOL(wp),
-        ' ', ' ', 0);
+                wp->w_wincol, (int)W_ENDCOL(wp),
+                ' ', ' ', 0);
   }
 
   if (screen_ins_lines(0, wp->w_winrow + row, line_count, (int)Rows, NULL)
@@ -6853,8 +6851,8 @@ static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int de
    */
   if (row + line_count >= wp->w_height) {
     screen_fill(wp->w_winrow + row, wp->w_winrow + wp->w_height,
-        wp->w_wincol, (int)W_ENDCOL(wp),
-        ' ', ' ', 0);
+                wp->w_wincol, (int)W_ENDCOL(wp),
+                ' ', ' ', 0);
     return OK;
   }
 
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index edae3f60d5..38ccf12f60 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -242,7 +242,6 @@ enum {
 #define EXMODE_NORMAL           1
 #define EXMODE_VIM              2
 
-
 #ifdef NO_EXPANDPATH
 # define gen_expand_wildcards mch_expand_wildcards
 #endif