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)
This commit is contained in:
Bram Moolenaar
2019-03-30 18:47:01 +01:00
parent bd9bf266fc
commit abab0b0fdd
42 changed files with 26 additions and 189 deletions

View File

@@ -360,9 +360,7 @@ C2Pascal_save_and_remove_backslash(char_u *Cstring)
for (c = Cstring, p = PascalString+1, len = 0; (*c != 0) && (len < 255); c++)
{
if ((*c == '\\') && (c[1] != 0))
{
c++;
}
*p = *c;
p++;
len++;
@@ -1259,25 +1257,19 @@ InstallAEHandlers(void)
error = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
NewAEEventHandlerUPP(Handle_aevt_oapp_AE), 0, false);
if (error)
{
return error;
}
/* install quit application handler */
error = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
NewAEEventHandlerUPP(Handle_aevt_quit_AE), 0, false);
if (error)
{
return error;
}
/* install open document handler */
error = AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
NewAEEventHandlerUPP(HandleODocAE), 0, false);
if (error)
{
return error;
}
/* install print document handler */
error = AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments,
@@ -1331,15 +1323,11 @@ InstallAEHandlers(void)
error = AEInstallEventHandler('KAHL', 'GTTX',
NewAEEventHandlerUPP(Handle_KAHL_GTTX_AE), 0, false);
if (error)
{
return error;
}
error = AEInstallEventHandler('KAHL', 'SRCH',
NewAEEventHandlerUPP(Handle_KAHL_SRCH_AE), 0, false);
if (error)
{
return error;
}
error = AEInstallEventHandler('KAHL', 'MOD ',
NewAEEventHandlerUPP(Handle_KAHL_MOD_AE), 0, false);
#endif
@@ -3857,9 +3845,7 @@ draw_string_QD(int row, int col, char_u *s, int len, int flags)
/* SelectFont(hdc, gui.currFont); */
if (flags & DRAW_TRANSP)
{
TextMode(srcOr);
}
MoveTo(TEXT_X(col), TEXT_Y(row));
DrawText((char *)s, 0, len);
@@ -3939,9 +3925,7 @@ draw_string_ATSUI(int row, int col, char_u *s, int len, int flags)
/* SelectFont(hdc, gui.currFont); */
if (flags & DRAW_TRANSP)
{
TextMode(srcOr);
}
MoveTo(TEXT_X(col), TEXT_Y(row));
@@ -4620,13 +4604,9 @@ gui_mch_set_text_area_pos(int x, int y, int w, int h)
GetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound);
if (gui.which_scrollbars[SBAR_LEFT])
{
VimBound.left = -gui.scrollbar_width + 1;
}
else
{
VimBound.left = 0;
}
SetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound);
@@ -5675,9 +5655,8 @@ gui_mch_dialog(
/* Hang until one of the button is hit */
do
{
ModalDialog(dialogUPP, &itemHit);
} while ((itemHit < 1) || (itemHit > lastButton));
while ((itemHit < 1) || (itemHit > lastButton));
#ifdef USE_CARBONKEYHANDLER
dialog_busy = FALSE;