patch 9.0.1196: 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 #11813)
diff --git a/src/memfile.c b/src/memfile.c
index 0d816f3..e8cbe31 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -879,16 +879,16 @@
{
bhdr_T *hp;
- if ((hp = ALLOC_ONE(bhdr_T)) != NULL)
+ if ((hp = ALLOC_ONE(bhdr_T)) == NULL)
+ return NULL;
+
+ if ((hp->bh_data = alloc((size_t)mfp->mf_page_size * page_count))
+ == NULL)
{
- if ((hp->bh_data = alloc((size_t)mfp->mf_page_size * page_count))
- == NULL)
- {
- vim_free(hp); // not enough memory
- return NULL;
- }
- hp->bh_page_count = page_count;
+ vim_free(hp); // not enough memory
+ return NULL;
}
+ hp->bh_page_count = page_count;
return hp;
}
@@ -1209,12 +1209,12 @@
void
mf_fullname(memfile_T *mfp)
{
- if (mfp != NULL && mfp->mf_fname != NULL && mfp->mf_ffname != NULL)
- {
- vim_free(mfp->mf_fname);
- mfp->mf_fname = mfp->mf_ffname;
- mfp->mf_ffname = NULL;
- }
+ if (mfp == NULL || mfp->mf_fname == NULL || mfp->mf_ffname == NULL)
+ return;
+
+ vim_free(mfp->mf_fname);
+ mfp->mf_fname = mfp->mf_ffname;
+ mfp->mf_ffname = NULL;
}
/*