Fix some styles

32 files changed, 28 insertions, 52 deletions

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 3a835c1a10..de2cb64d59 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -74,6 +74,7 @@
 #define INVALID_DEVICE_ID UINT64_MAX
 
 #define HAVE_BUFLIST_MATCH
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "buffer.c.generated.h"
 #endif
@@ -84,7 +85,6 @@
 # define dev_T unsigned
 #endif
 
-
 static char *msg_loclist = N_("[Location List]");
 static char *msg_qflist = N_("[Quickfix List]");
 static char *e_auabort = N_("E855: Autocommands caused command to abort");
diff --git a/src/nvim/charset.h b/src/nvim/charset.h
index a4e5ca0eba..78d6f2a76c 100644
--- a/src/nvim/charset.h
+++ b/src/nvim/charset.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_CHARSET_H
 #define NVIM_CHARSET_H
 
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "charset.h.generated.h"
 #endif
diff --git a/src/nvim/cursor_shape.h b/src/nvim/cursor_shape.h
index 3eb2f0e387..9ce1b6e0a0 100644
--- a/src/nvim/cursor_shape.h
+++ b/src/nvim/cursor_shape.h
@@ -51,4 +51,4 @@ typedef struct cursor_entry {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "cursor_shape.h.generated.h"
 #endif
-#endif /* NVIM_CURSOR_SHAPE_H */
+#endif  // NVIM_CURSOR_SHAPE_H
diff --git a/src/nvim/diff.h b/src/nvim/diff.h
index 75aa658ab6..f6cef1cafd 100644
--- a/src/nvim/diff.h
+++ b/src/nvim/diff.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_DIFF_H
 #define NVIM_DIFF_H
 
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "diff.h.generated.h"
 #endif
diff --git a/src/nvim/digraph.h b/src/nvim/digraph.h
index 11a836c44b..b623969e08 100644
--- a/src/nvim/digraph.h
+++ b/src/nvim/digraph.h
@@ -1,7 +1,6 @@
 #ifndef NVIM_DIGRAPH_H
 #define NVIM_DIGRAPH_H
 
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "digraph.h.generated.h"
 #endif
diff --git a/src/nvim/edit.h b/src/nvim/edit.h
index f80e602925..52b8ae923b 100644
--- a/src/nvim/edit.h
+++ b/src/nvim/edit.h
@@ -14,8 +14,7 @@
 
 typedef int (*IndentGetter)(void);
 
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "edit.h.generated.h"
 #endif
-#endif /* NVIM_EDIT_H */
+#endif  // NVIM_EDIT_H
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7215052a9f..85361b50f4 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -416,15 +416,10 @@ static dictitem_T vimvars_var;                  /* variable used for v: */
 # include "eval.c.generated.h"
 #endif
 
-
-
-
 #define FNE_INCL_BR     1       /* find_name_end(): include [] in name */
 #define FNE_CHECK_START 2       /* find_name_end(): check name starts with
                                    valid character */
 
-
-
 /*
  * Initialize the global and v: variables.
  */
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 2d24225c01..02d8f6f9af 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -46,6 +46,7 @@
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
 
+
 /* Growarray to store info about already sourced scripts.
  * Also store the dev/ino, so that we don't have to stat() each
  * script when going through the list. */
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 2f35be75e6..abb1bb4f86 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -119,7 +119,6 @@ static int cmd_hkmap = 0;       /* Hebrew mapping during command line */
 
 static int cmd_fkmap = 0;       /* Farsi mapping during command line */
 
-
 /*
  * getcmdline() - accept a command line starting with firstc.
  *
diff --git a/src/nvim/fold.h b/src/nvim/fold.h
index 7c17c95039..1cbd7af5da 100644
--- a/src/nvim/fold.h
+++ b/src/nvim/fold.h
@@ -17,4 +17,4 @@ typedef struct foldinfo {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "fold.h.generated.h"
 #endif
-#endif /* NVIM_FOLD_H */
+#endif  // NVIM_FOLD_H
diff --git a/src/nvim/hardcopy.h b/src/nvim/hardcopy.h
index 25b9ced094..fa171db989 100644
--- a/src/nvim/hardcopy.h
+++ b/src/nvim/hardcopy.h
@@ -74,4 +74,4 @@ typedef struct {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "hardcopy.h.generated.h"
 #endif
-#endif /* NVIM_HARDCOPY_H */
+#endif  // NVIM_HARDCOPY_H
diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h
index e9b7ab8f7f..490efdd7d9 100644
--- a/src/nvim/keymap.h
+++ b/src/nvim/keymap.h
@@ -502,4 +502,4 @@ enum key_extra {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "keymap.h.generated.h"
 #endif
-#endif /* NVIM_KEYMAP_H */
+#endif  // NVIM_KEYMAP_H
diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h
index d69157fc44..d910851543 100644
--- a/src/nvim/lib/klist.h
+++ b/src/nvim/lib/klist.h
@@ -58,7 +58,7 @@
         --mp->cnt;                                                      \
         if (mp->n == mp->max) {                                         \
             mp->max = mp->max? mp->max<<1 : 16;                         \
-            mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max);       \
+            mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \
         }                                                               \
         mp->buf[mp->n++] = p;                                           \
     }
@@ -81,7 +81,7 @@
         kmp_##name##_t *mp;                                             \
         size_t size;                                                    \
     } kl_##name##_t;                                                    \
-    static inline kl_##name##_t *kl_init_##name(void) {                     \
+    static inline kl_##name##_t *kl_init_##name(void) {                 \
         kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t));          \
         kl->mp = kmp_init(name);                                        \
         kl->head = kl->tail = kmp_alloc(name, kl->mp);                  \
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
index 94fe038f49..312154ee2b 100644
--- a/src/nvim/misc2.c
+++ b/src/nvim/misc2.c
@@ -52,6 +52,7 @@
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
 
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "misc2.c.generated.h"
 #endif
diff --git a/src/nvim/normal.h b/src/nvim/normal.h
index 44a51b35c3..e51ce97db3 100644
--- a/src/nvim/normal.h
+++ b/src/nvim/normal.h
@@ -60,4 +60,4 @@ typedef struct cmdarg_S {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "normal.h.generated.h"
 #endif
-#endif /* NVIM_NORMAL_H */
+#endif  // NVIM_NORMAL_H
diff --git a/src/nvim/os/job.h b/src/nvim/os/job.h
index 665bdffdb5..f48218ffe7 100644
--- a/src/nvim/os/job.h
+++ b/src/nvim/os/job.h
@@ -10,8 +10,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "nvim/os/event_defs.h"
 #include "nvim/os/rstream_defs.h"
+#include "nvim/os/event_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/job.h.generated.h"
diff --git a/src/nvim/os/rstream.h b/src/nvim/os/rstream.h
index 059b2a5ce8..713d1e77e6 100644
--- a/src/nvim/os/rstream.h
+++ b/src/nvim/os/rstream.h
@@ -4,8 +4,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <uv.h>
-
 #include "nvim/os/event_defs.h"
+
 #include "nvim/os/rstream_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/os/shell.h b/src/nvim/os/shell.h
index 3d0e32bf67..e912baedf8 100644
--- a/src/nvim/os/shell.h
+++ b/src/nvim/os/shell.h
@@ -2,7 +2,6 @@
 #define NVIM_OS_SHELL_H
 
 #include <stdbool.h>
-
 #include "nvim/types.h"
 
 // Flags for mch_call_shell() second argument
@@ -17,11 +16,7 @@ typedef enum {
   kShellOptHideMess = 128,  ///< previously a global variable from os_unix.c
 } ShellOpts;
 
-
-
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/shell.h.generated.h"
 #endif
 #endif  // NVIM_OS_SHELL_H
-
diff --git a/src/nvim/os/signal.h b/src/nvim/os/signal.h
index 7cdde3c71a..927437b2db 100644
--- a/src/nvim/os/signal.h
+++ b/src/nvim/os/signal.h
@@ -3,9 +3,7 @@
 
 #include "nvim/os/event_defs.h"
 
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/signal.h.generated.h"
 #endif
 #endif  // NVIM_OS_SIGNAL_H
-
diff --git a/src/nvim/os/time.h b/src/nvim/os/time.h
index cfe7eb85ff..8c73fc0c3b 100644
--- a/src/nvim/os/time.h
+++ b/src/nvim/os/time.h
@@ -4,13 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-
-
-
-
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/time.h.generated.h"
 #endif
 #endif  // NVIM_OS_TIME_H
-
diff --git a/src/nvim/os/wstream.c b/src/nvim/os/wstream.c
index 899b97da7e..c2ed05b78f 100644
--- a/src/nvim/os/wstream.c
+++ b/src/nvim/os/wstream.c
@@ -34,6 +34,7 @@ typedef struct {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/wstream.c.generated.h"
 #endif
+
 /// Creates a new WStream instance. A WStream encapsulates all the boilerplate
 /// necessary for writing to a libuv stream.
 ///
diff --git a/src/nvim/pos.h b/src/nvim/pos.h
index dd647e52e4..11f62ad480 100644
--- a/src/nvim/pos.h
+++ b/src/nvim/pos.h
@@ -20,4 +20,4 @@ typedef struct {
   colnr_T col;          /* column number */
 } lpos_T;
 
-#endif /* NVIM_POS_H */
+#endif  // NVIM_POS_H
diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h
index 0b25e8b52d..c3b7d714c7 100644
--- a/src/nvim/quickfix.h
+++ b/src/nvim/quickfix.h
@@ -1,8 +1,7 @@
 #ifndef NVIM_QUICKFIX_H
 #define NVIM_QUICKFIX_H
-/* quickfix.c */
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "quickfix.h.generated.h"
 #endif
-#endif /* NVIM_QUICKFIX_H */
+#endif  // NVIM_QUICKFIX_H
diff --git a/src/nvim/screen.h b/src/nvim/screen.h
index 96e14df112..72bdc07fe3 100644
--- a/src/nvim/screen.h
+++ b/src/nvim/screen.h
@@ -1,8 +1,7 @@
 #ifndef NVIM_SCREEN_H
 #define NVIM_SCREEN_H
-/* screen.c */
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "screen.h.generated.h"
 #endif
-#endif /* NVIM_SCREEN_H */
+#endif  // NVIM_SCREEN_H
diff --git a/src/nvim/search.h b/src/nvim/search.h
index fd6f0d3c3e..7dc45f307c 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -1,8 +1,7 @@
 #ifndef NVIM_SEARCH_H
 #define NVIM_SEARCH_H
-/* search.c */
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "search.h.generated.h"
 #endif
-#endif /* NVIM_SEARCH_H */
+#endif  // NVIM_SEARCH_H
diff --git a/src/nvim/spell.h b/src/nvim/spell.h
index 373bd3095d..2945fcbdcb 100644
--- a/src/nvim/spell.h
+++ b/src/nvim/spell.h
@@ -4,4 +4,4 @@
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "spell.h.generated.h"
 #endif
-#endif // NVIM_SPELL_H
+#endif  // NVIM_SPELL_H
diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h
index 71c5c193c7..ce79c49e69 100644
--- a/src/nvim/syntax.h
+++ b/src/nvim/syntax.h
@@ -5,9 +5,8 @@
 
 typedef int guicolor_T;
 
-/* syntax.c */
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "syntax.h.generated.h"
 #endif
 
-#endif /* NVIM_SYNTAX_H */
+#endif  // NVIM_SYNTAX_H
diff --git a/src/nvim/tag.h b/src/nvim/tag.h
index 9380199c31..c26f6b3388 100644
--- a/src/nvim/tag.h
+++ b/src/nvim/tag.h
@@ -16,4 +16,4 @@ typedef struct {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "tag.h.generated.h"
 #endif
-#endif /* NVIM_TAG_H */
+#endif  // NVIM_TAG_H
diff --git a/src/nvim/term.h b/src/nvim/term.h
index 9cb67c1959..a96a2fd6a6 100644
--- a/src/nvim/term.h
+++ b/src/nvim/term.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_TERM_H
 #define NVIM_TERM_H
-/* term.c */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "term.h.generated.h"
 #endif
-#endif /* NVIM_TERM_H */
+#endif  // NVIM_TERM_H
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index ff6f243947..d26f6ab9cf 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_UI_H
 #define NVIM_UI_H
-/* ui.c */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui.h.generated.h"
 #endif
-#endif /* NVIM_UI_H */
+#endif  // NVIM_UI_H
diff --git a/src/nvim/undo.h b/src/nvim/undo.h
index 053e62fdde..ab8584fbb2 100644
--- a/src/nvim/undo.h
+++ b/src/nvim/undo.h
@@ -6,4 +6,4 @@
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "undo.h.generated.h"
 #endif
-#endif /* NVIM_UNDO_H */
+#endif  // NVIM_UNDO_H
diff --git a/src/nvim/window.h b/src/nvim/window.h
index d9c359be2a..1c0633c4f2 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -1,7 +1,7 @@
 #ifndef NVIM_WINDOW_H
 #define NVIM_WINDOW_H
-/* window.c */
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "window.h.generated.h"
 #endif
-#endif /* NVIM_WINDOW_H */
+#endif  // NVIM_WINDOW_H