patch 9.0.1132: code is indented more than needed
Problem: Code is indented more than needed.
Solution: Use an early return to reduce indentation. (Yegappan Lakshmanan,
closes #11769)
diff --git a/src/evalvars.c b/src/evalvars.c
index d946669..389a9e4 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -350,15 +350,15 @@
typval_T *tvp;
val = vim_strsave(value);
- if (val != NULL)
- {
- tvp = alloc_string_tv(val);
- if (tvp != NULL)
- {
- set_var(name, tvp, FALSE);
- free_tv(tvp);
- }
- }
+ if (val == NULL)
+ return;
+
+ tvp = alloc_string_tv(val);
+ if (tvp == NULL)
+ return;
+
+ set_var(name, tvp, FALSE);
+ free_tv(tvp);
}
int
@@ -576,14 +576,14 @@
hashitem_T *hi;
vimvars[idx].vv_tv = *save_tv;
- if (vimvars[idx].vv_tv_type == VAR_UNKNOWN)
- {
- hi = hash_find(&vimvarht, vimvars[idx].vv_di.di_key);
- if (HASHITEM_EMPTY(hi))
- internal_error("restore_vimvar()");
- else
- hash_remove(&vimvarht, hi, "restore vimvar");
- }
+ if (vimvars[idx].vv_tv_type != VAR_UNKNOWN)
+ return;
+
+ hi = hash_find(&vimvarht, vimvars[idx].vv_di.di_key);
+ if (HASHITEM_EMPTY(hi))
+ internal_error("restore_vimvar()");
+ else
+ hash_remove(&vimvarht, hi, "restore vimvar");
}
/*
@@ -2740,11 +2740,11 @@
clear_tv(&vimvars[idx].vv_di.di_tv);
vimvars[idx].vv_tv_type = VAR_DICT;
vimvars[idx].vv_dict = val;
- if (val != NULL)
- {
- ++val->dv_refcount;
- dict_set_items_ro(val);
- }
+ if (val == NULL)
+ return;
+
+ ++val->dv_refcount;
+ dict_set_items_ro(val);
}
/*
@@ -3562,11 +3562,11 @@
{
dictitem_T *di = HI2DI(hi);
- if (hash_remove(ht, hi, "delete variable") == OK)
- {
- clear_tv(&di->di_tv);
- vim_free(di);
- }
+ if (hash_remove(ht, hi, "delete variable") != OK)
+ return;
+
+ clear_tv(&di->di_tv);
+ vim_free(di);
}
/*
@@ -4317,29 +4317,29 @@
varname = tv_get_string_chk(&argvars[off + 1]);
varp = &argvars[off + 2];
- if (win != NULL && varname != NULL && varp != NULL)
+ if (win == NULL || varname == NULL || varp == NULL)
+ return;
+
+ need_switch_win = !(tp == curtab && win == curwin);
+ if (!need_switch_win
+ || switch_win(&switchwin, win, tp, TRUE) == OK)
{
- need_switch_win = !(tp == curtab && win == curwin);
- if (!need_switch_win
- || switch_win(&switchwin, win, tp, TRUE) == OK)
+ if (*varname == '&')
+ set_option_from_tv(varname + 1, varp);
+ else
{
- if (*varname == '&')
- set_option_from_tv(varname + 1, varp);
- else
+ winvarname = alloc(STRLEN(varname) + 3);
+ if (winvarname != NULL)
{
- winvarname = alloc(STRLEN(varname) + 3);
- if (winvarname != NULL)
- {
- STRCPY(winvarname, "w:");
- STRCPY(winvarname + 2, varname);
- set_var(winvarname, varp, TRUE);
- vim_free(winvarname);
- }
+ STRCPY(winvarname, "w:");
+ STRCPY(winvarname + 2, varname);
+ set_var(winvarname, varp, TRUE);
+ vim_free(winvarname);
}
}
- if (need_switch_win)
- restore_win(&switchwin, TRUE);
}
+ if (need_switch_win)
+ restore_win(&switchwin, TRUE);
}
/*
@@ -4686,24 +4686,24 @@
varname = tv_get_string_chk(&argvars[1]);
varp = &argvars[2];
- if (varname != NULL && varp != NULL && tp != NULL)
+ if (varname == NULL || varp == NULL || tp == NULL)
+ return;
+
+ save_curtab = curtab;
+ goto_tabpage_tp(tp, FALSE, FALSE);
+
+ tabvarname = alloc(STRLEN(varname) + 3);
+ if (tabvarname != NULL)
{
- save_curtab = curtab;
- goto_tabpage_tp(tp, FALSE, FALSE);
-
- tabvarname = alloc(STRLEN(varname) + 3);
- if (tabvarname != NULL)
- {
- STRCPY(tabvarname, "t:");
- STRCPY(tabvarname + 2, varname);
- set_var(tabvarname, varp, TRUE);
- vim_free(tabvarname);
- }
-
- // Restore current tabpage
- if (valid_tabpage(save_curtab))
- goto_tabpage_tp(save_curtab, FALSE, FALSE);
+ STRCPY(tabvarname, "t:");
+ STRCPY(tabvarname + 2, varname);
+ set_var(tabvarname, varp, TRUE);
+ vim_free(tabvarname);
}
+
+ // Restore current tabpage
+ if (valid_tabpage(save_curtab))
+ goto_tabpage_tp(save_curtab, FALSE, FALSE);
}
/*
@@ -4757,37 +4757,37 @@
buf = tv_get_buf_from_arg(&argvars[0]);
varp = &argvars[2];
- if (buf != NULL && varname != NULL && varp != NULL)
+ if (buf == NULL || varname == NULL || varp == NULL)
+ return;
+
+ if (*varname == '&')
{
- if (*varname == '&')
+ aco_save_T aco;
+
+ // Set curbuf to be our buf, temporarily.
+ aucmd_prepbuf(&aco, buf);
+ if (curbuf == buf)
{
- aco_save_T aco;
+ // Only when it worked to set "curbuf".
+ set_option_from_tv(varname + 1, varp);
- // Set curbuf to be our buf, temporarily.
- aucmd_prepbuf(&aco, buf);
- if (curbuf == buf)
- {
- // Only when it worked to set "curbuf".
- set_option_from_tv(varname + 1, varp);
-
- // reset notion of buffer
- aucmd_restbuf(&aco);
- }
+ // reset notion of buffer
+ aucmd_restbuf(&aco);
}
- else
+ }
+ else
+ {
+ bufvarname = alloc(STRLEN(varname) + 3);
+ if (bufvarname != NULL)
{
- bufvarname = alloc(STRLEN(varname) + 3);
- if (bufvarname != NULL)
- {
- buf_T *save_curbuf = curbuf;
+ buf_T *save_curbuf = curbuf;
- curbuf = buf;
- STRCPY(bufvarname, "b:");
- STRCPY(bufvarname + 2, varname);
- set_var(bufvarname, varp, TRUE);
- vim_free(bufvarname);
- curbuf = save_curbuf;
- }
+ curbuf = buf;
+ STRCPY(bufvarname, "b:");
+ STRCPY(bufvarname + 2, varname);
+ set_var(bufvarname, varp, TRUE);
+ vim_free(bufvarname);
+ curbuf = save_curbuf;
}
}
}
@@ -4930,31 +4930,30 @@
p = vim_strchr(name, '.');
if (p == NULL)
return;
+
import = find_imported(name, p - name, FALSE);
- if (import != NULL && SCRIPT_ID_VALID(import->imp_sid))
+ if (import == NULL || !SCRIPT_ID_VALID(import->imp_sid))
+ return;
+
+ scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
+ if (si->sn_autoload_prefix == NULL)
+ return;
+
+ char_u *newname = concat_str(si->sn_autoload_prefix, p + 1);
+ if (newname == NULL)
+ return;
+
+ if (cb->cb_partial != NULL)
{
- scriptitem_T *si = SCRIPT_ITEM(import->imp_sid);
-
- if (si->sn_autoload_prefix != NULL)
- {
- char_u *newname = concat_str(si->sn_autoload_prefix, p + 1);
-
- if (newname != NULL)
- {
- if (cb->cb_partial != NULL)
- {
- if (cb->cb_name == cb->cb_partial->pt_name)
- cb->cb_name = newname;
- vim_free(cb->cb_partial->pt_name);
- cb->cb_partial->pt_name = newname;
- }
- else
- {
- vim_free(cb->cb_name);
- cb->cb_name = newname;
- }
- }
- }
+ if (cb->cb_name == cb->cb_partial->pt_name)
+ cb->cb_name = newname;
+ vim_free(cb->cb_partial->pt_name);
+ cb->cb_partial->pt_name = newname;
+ }
+ else
+ {
+ vim_free(cb->cb_name);
+ cb->cb_name = newname;
}
}