patch 8.1.1086: too many curly braces

Problem:    Too many curly braces.
Solution:   Remove curly braces where they are not needed. (Hirohito Higashi,
            closes #3982)

Author: brammool

src/autocmd.c

@@ -517,9 +517,7 @@ au_del_group(char_u *name)
 	}
 	vim_free(AUGROUP_NAME(i));
 	if (in_use)
-	{
 	    AUGROUP_NAME(i) = get_deleted_augroup();
-	}
 	else
 	    AUGROUP_NAME(i) = NULL;
     }

src/buffer.c

@@ -1595,9 +1595,7 @@ do_buffer(
     set_curbuf(buf, action);
 
     if (action == DOBUF_SPLIT)
-    {
 	RESET_BINDING(curwin);	/* reset 'scrollbind' and 'cursorbind' */
-    }
 
 #if defined(FEAT_EVAL)
     if (aborting())	    /* autocmds may abort script processing */
@@ -3054,9 +3052,8 @@ buflist_list(exarg_T *eap)
 	/* put "line 999" in column 40 or after the file name */
 	i = 40 - vim_strsize(IObuff);
 	do
-	{
 	    IObuff[len++] = ' ';
-	} while (--i > 0 && len < IOSIZE - 18);
+	while (--i > 0 && len < IOSIZE - 18);
 	vim_snprintf((char *)IObuff + len, (size_t)(IOSIZE - len),
 		_("line %ld"), buf == curbuf ? curwin->w_cursor.lnum
 					       : (long)buflist_findlnum(buf));

src/crypt_zip.c

@@ -68,12 +68,12 @@ make_crc_tab(void)
 /*
  * Update the encryption keys with the next byte of plain text.
  */
-#define UPDATE_KEYS_ZIP(keys, c) { \
+#define UPDATE_KEYS_ZIP(keys, c) do { \
     keys[0] = CRC32(keys[0], (c)); \
     keys[1] += keys[0] & 0xff; \
     keys[1] = keys[1] * 134775813L + 1; \
     keys[2] = CRC32(keys[2], (int)(keys[1] >> 24)); \
-}
+} while (0)
 
 /*
  * Initialize for encryption/decryption.
@@ -98,9 +98,7 @@ crypt_zip_init(
     zs->keys[1] = 591751049L;
     zs->keys[2] = 878082192L;
     for (p = key; *p != NUL; ++p)
-    {
 	UPDATE_KEYS_ZIP(zs->keys, (int)*p);
-    }
 }
 
 /*

src/dosinst.c

@@ -849,7 +849,7 @@ install_bat_choice(int idx)
 	     * for MSDOS and NT.
 	     * The order of preference is:
 	     * 1. $VIMRUNTIME/vim.exe	    (user preference)
-	     * 2. $VIM/vim70/vim.exe	    (hard coded version)
+	     * 2. $VIM/vim81/vim.exe	    (hard coded version)
 	     * 3. installdir/vim.exe	    (hard coded install directory)
 	     */
 	    fprintf(fd, "set VIM_EXE_DIR=%s\n", installdir);
@@ -1568,9 +1568,7 @@ register_openwith(
 
 	for (i = 0; ERROR_SUCCESS == lRet
 			   && i < sizeof(openwith) / sizeof(openwith[0]); i++)
-	{
 	    lRet = reg_create_key_and_value(hRootKey, openwith[i], NULL, "", flag);
-	}
     }
 
     return lRet;

src/edit.c

@@ -5363,9 +5363,8 @@ bracketed_paste(paste_mode_T mode, int drop, garray_T *gap)
 	if (end == NULL && vpeekc() == NUL)
 	    break;
 	do
-	{
 	    c = vgetc();
-	} while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
+	while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
 	if (c == NUL || got_int)
 	    // When CTRL-C was encountered the typeahead will be flushed and we
 	    // won't get the end sequence.

src/evalfunc.c

@@ -3568,9 +3568,7 @@ f_expand(typval_T *argvars, typval_T *rettv)
 	    && argvars[2].v_type != VAR_UNKNOWN
 	    && tv_get_number_chk(&argvars[2], &error)
 	    && !error)
-    {
 	rettv_list_set(rettv, NULL);
-    }
 
     s = tv_get_string(&argvars[0]);
     if (*s == '%' || *s == '#' || *s == '<')
@@ -6081,9 +6079,7 @@ f_glob(typval_T *argvars, typval_T *rettv)
 	if (argvars[2].v_type != VAR_UNKNOWN)
 	{
 	    if (tv_get_number_chk(&argvars[2], &error))
-	    {
 		rettv_list_set(rettv, NULL);
-	    }
 	    if (argvars[3].v_type != VAR_UNKNOWN
 				    && tv_get_number_chk(&argvars[3], &error))
 		options |= WILD_ALLLINKS;
@@ -6137,9 +6133,7 @@ f_globpath(typval_T *argvars, typval_T *rettv)
 	if (argvars[3].v_type != VAR_UNKNOWN)
 	{
 	    if (tv_get_number_chk(&argvars[3], &error))
-	    {
 		rettv_list_set(rettv, NULL);
-	    }
 	    if (argvars[4].v_type != VAR_UNKNOWN
 				    && tv_get_number_chk(&argvars[4], &error))
 		flags |= WILD_ALLLINKS;

src/ex_cmds.c

@@ -3361,9 +3361,7 @@ do_write(exarg_T *eap)
 	/* Change directories when the 'acd' option is set and the file name
 	 * got changed or set. */
 	if (eap->cmdidx == CMD_saveas || name_was_missing)
-	{
 	    DO_AUTOCHDIR;
-	}
     }
 
 theend:

src/ex_docmd.c

@@ -8407,9 +8407,7 @@ ex_splitview(exarg_T *eap)
 		|| cmdmod.browse
 # endif
 	   )
-	{
 	    RESET_BINDING(curwin);
-	}
 	else
 	    do_check_scrollbind(FALSE);
 	do_exedit(eap, old_curwin);

src/ex_getln.c

@@ -1029,9 +1029,8 @@ getcmdline_int(
 	/* Get a character.  Ignore K_IGNORE and K_NOP, they should not do
 	 * anything, such as stop completion. */
 	do
-	{
 	    c = safe_vgetc();
-	} while (c == K_IGNORE || c == K_NOP);
+	while (c == K_IGNORE || c == K_NOP);
 
 	if (KeyTyped)
 	{
@@ -2833,9 +2832,8 @@ getexmodeline(
 		    if (*p == TAB)
 		    {
 			do
-			{
 			    msg_putchar(' ');
-			} while (++vcol % 8);
+			while (++vcol % 8);
 			++p;
 		    }
 		    else
@@ -2908,9 +2906,8 @@ getexmodeline(
 	{
 	    /* Don't use chartabsize(), 'ts' can be different */
 	    do
-	    {
 		msg_putchar(' ');
-	    } while (++vcol % 8);
+	    while (++vcol % 8);
 	}
 	else
 	{

src/getchar.c

@@ -1813,9 +1813,8 @@ plain_vgetc(void)
     int c;
 
     do
-    {
 	c = safe_vgetc();
-    } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
+    while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
 
     if (c == K_PS)
 	/* Only handle the first pasted character.  Drop the rest, since we