eval/*: Fix some linter errors

2 files changed, 42 insertions, 46 deletions

diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 05dc1c97c4..5a3c5709ad 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -193,8 +193,8 @@ int json_decode_string(const char *const buf, const size_t len,
         } else if (didcolon) {
           EMSG2(_("E474: Comma after colon: %s"), p);
           goto json_decode_string_fail;
-        } if (last_container.container.v_type == VAR_DICT
-            && last_container.stack_index != kv_size(stack) - 1) {
+        } else if (last_container.container.v_type == VAR_DICT
+                   && last_container.stack_index != kv_size(stack) - 1) {
           EMSG2(_("E474: Using comma in place of colon: %s"), p);
           goto json_decode_string_fail;
         } else if ((last_container.container.v_type == VAR_DICT
@@ -364,8 +364,7 @@ int json_decode_string(const char *const buf, const size_t len,
                   const int full_char = (
                       (int) (ch - SURROGATE_LO_START)
                       + ((fst_in_pair - SURROGATE_HI_START) << 10)
-                      + SURROGATE_FIRST_CHAR
-                  );
+                      + SURROGATE_FIRST_CHAR);
                   str_end += utf_char2bytes(full_char, (char_u *) str_end);
                   fst_in_pair = 0;
                 } else {
@@ -763,7 +762,7 @@ msgpack_to_vim_generic_map: {}
         .vval = { .v_list = list },
       }));
       if (encode_list_write((void *) ext_val_list, mobj.via.ext.ptr,
-                             mobj.via.ext.size) == -1) {
+                            mobj.via.ext.size) == -1) {
         return FAIL;
       }
       break;
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index e44512d803..5c843357f2 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -194,13 +194,13 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack,
 ///
 /// @param[in]  list  Converted list.
 /// @param[out]  ret_len  Resulting buffer length.
-/// @param[out]  ret_buf  Allocated buffer with the result or NULL if ret_len is 
+/// @param[out]  ret_buf  Allocated buffer with the result or NULL if ret_len is
 ///                       zero.
 ///
 /// @return true in case of success, false in case of failure.
 bool encode_vim_list_to_buf(const list_T *const list, size_t *const ret_len,
                             char **const ret_buf)
-  FUNC_ATTR_NONNULL_ARG(2,3) FUNC_ATTR_WARN_UNUSED_RESULT
+  FUNC_ATTR_NONNULL_ARG(2, 3) FUNC_ATTR_WARN_UNUSED_RESULT
 {
   size_t len = 0;
   if (list != NULL) {
@@ -336,18 +336,15 @@ static int name##_convert_one_value(firstargtype firstargname, \
       } \
       CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, kMPConvList); \
       CONV_LIST_START(tv->vval.v_list); \
-      kv_push( \
-          MPConvStackVal, \
-          *mpstack, \
-          ((MPConvStackVal) { \
-            .type = kMPConvList, \
-            .data = { \
-              .l = { \
-                .list = tv->vval.v_list, \
-                .li = tv->vval.v_list->lv_first, \
-              }, \
-            }, \
-          })); \
+      kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
+        .type = kMPConvList, \
+        .data = { \
+          .l = { \
+            .list = tv->vval.v_list, \
+            .li = tv->vval.v_list->lv_first, \
+          }, \
+        }, \
+      })); \
       break; \
     } \
     case VAR_SPECIAL: { \
@@ -475,14 +472,14 @@ static int name##_convert_one_value(firstargtype firstargname, \
                                  kMPConvList); \
             CONV_LIST_START(val_di->di_tv.vval.v_list); \
             kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-                      .type = kMPConvList, \
-                      .data = { \
-                        .l = { \
-                          .list = val_di->di_tv.vval.v_list, \
-                          .li = val_di->di_tv.vval.v_list->lv_first, \
-                        }, \
-                      }, \
-                    })); \
+              .type = kMPConvList, \
+              .data = { \
+                .l = { \
+                  .list = val_di->di_tv.vval.v_list, \
+                  .li = val_di->di_tv.vval.v_list->lv_first, \
+                }, \
+              }, \
+            })); \
             break; \
           } \
           case kMPMap: { \
@@ -504,14 +501,14 @@ static int name##_convert_one_value(firstargtype firstargname, \
             CHECK_SELF_REFERENCE(val_list, lv_copyID, kMPConvPairs); \
             CONV_DICT_START(val_list->lv_len); \
             kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-                      .type = kMPConvPairs, \
-                      .data = { \
-                        .l = { \
-                          .list = val_list, \
-                          .li = val_list->lv_first, \
-                        }, \
-                      }, \
-                    })); \
+              .type = kMPConvPairs, \
+              .data = { \
+                .l = { \
+                  .list = val_list, \
+                  .li = val_list->lv_first, \
+                }, \
+              }, \
+            })); \
             break; \
           } \
           case kMPExt: { \
@@ -543,15 +540,15 @@ name##_convert_one_value_regular_dict: \
       CHECK_SELF_REFERENCE(tv->vval.v_dict, dv_copyID, kMPConvDict); \
       CONV_DICT_START(tv->vval.v_dict->dv_hashtab.ht_used); \
       kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-                .type = kMPConvDict, \
-                .data = { \
-                  .d = { \
-                    .dict = tv->vval.v_dict, \
-                    .hi = tv->vval.v_dict->dv_hashtab.ht_array, \
-                    .todo = tv->vval.v_dict->dv_hashtab.ht_used, \
-                  }, \
-                }, \
-              })); \
+        .type = kMPConvDict, \
+        .data = { \
+          .d = { \
+            .dict = tv->vval.v_dict, \
+            .hi = tv->vval.v_dict->dv_hashtab.ht_array, \
+            .todo = tv->vval.v_dict->dv_hashtab.ht_used, \
+          }, \
+        }, \
+      })); \
       break; \
     } \
     case VAR_UNKNOWN: { \
@@ -971,7 +968,7 @@ static inline int convert_to_json_string(garray_T *const gap,
           if (vim_isprintc(ch)) {
             ga_concat_len(gap, buf + i, shift);
           } else if (ch < SURROGATE_FIRST_CHAR) {
-            ga_concat_len(gap, ((const char []) {
+            ga_concat_len(gap, ((const char[]) {
                 '\\', 'u',
                 xdigits[(ch >> (4 * 3)) & 0xF],
                 xdigits[(ch >> (4 * 2)) & 0xF],
@@ -982,7 +979,7 @@ static inline int convert_to_json_string(garray_T *const gap,
             uint32_t tmp = (uint32_t) ch - SURROGATE_FIRST_CHAR;
             uint16_t hi = SURROGATE_HI_START + ((tmp >> 10) & ((1 << 10) - 1));
             uint16_t lo = SURROGATE_LO_END + ((tmp >>  0) & ((1 << 10) - 1));
-            ga_concat_len(gap, ((const char []) {
+            ga_concat_len(gap, ((const char[]) {
                 '\\', 'u',
                 xdigits[(hi >> (4 * 3)) & 0xF],
                 xdigits[(hi >> (4 * 2)) & 0xF],