1
0
forked from aniani/vim

patch 9.0.1208: code is indented more than necessary

Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes #11819)
This commit is contained in:
Yegappan Lakshmanan
2023-01-16 18:19:05 +00:00
committed by Bram Moolenaar
parent 450c7a97d1
commit a41e221935
12 changed files with 1318 additions and 1312 deletions

View File

@@ -234,13 +234,13 @@ mch_delay(long msec, int flags)
void Delay(long);
#endif
if (msec > 0)
{
if (flags & MCH_DELAY_IGNOREINPUT)
Delay(msec / 20L); // Delay works with 20 msec intervals
else
WaitForChar(raw_in, msec * 1000L);
}
if (msec <= 0)
return;
if (flags & MCH_DELAY_IGNOREINPUT)
Delay(msec / 20L); // Delay works with 20 msec intervals
else
WaitForChar(raw_in, msec * 1000L);
}
/*
@@ -577,18 +577,18 @@ fname_case(
size_t flen;
fib = get_fib(name);
if (fib != NULL)
{
flen = STRLEN(name);
// TODO: Check if this fix applies to AmigaOS < 4 too.
if (fib == NULL)
return;
flen = STRLEN(name);
// TODO: Check if this fix applies to AmigaOS < 4 too.
#ifdef __amigaos4__
if (fib->fib_DirEntryType == ST_ROOT)
strcat(fib->fib_FileName, ":");
if (fib->fib_DirEntryType == ST_ROOT)
strcat(fib->fib_FileName, ":");
#endif
if (flen == strlen(fib->fib_FileName)) // safety check
mch_memmove(name, fib->fib_FileName, flen);
free_fib(fib);
}
if (flen == strlen(fib->fib_FileName)) // safety check
mch_memmove(name, fib->fib_FileName, flen);
free_fib(fib);
}
/*
@@ -609,17 +609,17 @@ get_fib(char_u *fname)
#else
fib = ALLOC_ONE(struct FileInfoBlock);
#endif
if (fib != NULL)
if (fib == NULL)
return;
flock = Lock((UBYTE *)fname, (long)ACCESS_READ);
if (flock == (BPTR)NULL || !Examine(flock, fib))
{
flock = Lock((UBYTE *)fname, (long)ACCESS_READ);
if (flock == (BPTR)NULL || !Examine(flock, fib))
{
free_fib(fib); // in case of an error the memory is freed here
fib = NULL;
}
if (flock)
UnLock(flock);
free_fib(fib); // in case of an error the memory is freed here
fib = NULL;
}
if (flock)
UnLock(flock);
return fib;
}
@@ -815,11 +815,11 @@ mch_getperm(char_u *name)
long retval = -1;
fib = get_fib(name);
if (fib != NULL)
{
retval = fib->fib_Protection;
free_fib(fib);
}
if (fib == NULL)
return -1;
retval = fib->fib_Protection;
free_fib(fib);
return retval;
}
@@ -856,15 +856,15 @@ mch_isdir(char_u *name)
int retval = FALSE;
fib = get_fib(name);
if (fib != NULL)
{
if (fib == NULL)
return FALSE;
#ifdef __amigaos4__
retval = (FIB_IS_DRAWER(fib)) ? TRUE : FALSE;
retval = (FIB_IS_DRAWER(fib)) ? TRUE : FALSE;
#else
retval = ((fib->fib_DirEntryType >= 0) ? TRUE : FALSE);
retval = ((fib->fib_DirEntryType >= 0) ? TRUE : FALSE);
#endif
free_fib(fib);
}
free_fib(fib);
return retval;
}
@@ -877,12 +877,11 @@ mch_mkdir(char_u *name)
BPTR lock;
lock = CreateDir(name);
if (lock != NULL)
{
UnLock(lock);
return 0;
}
return -1;
if (lock == NULL)
return -1;
UnLock(lock);
return 0;
}
/*
@@ -1173,17 +1172,17 @@ out:
void
mch_set_shellsize(void)
{
if (term_console)
{
size_set = TRUE;
out_char(CSI);
out_num((long)Rows);
out_char('t');
out_char(CSI);
out_num((long)Columns);
out_char('u');
out_flush();
}
if (!term_console)
return;
size_set = TRUE;
out_char(CSI);
out_num((long)Rows);
out_char('t');
out_char(CSI);
out_num((long)Columns);
out_char('u');
out_flush();
}
/*