aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorrolag <rolag@users.noreply.github.com>2019-04-28 19:58:13 +0100
committerrolag <rolag@users.noreply.github.com>2019-04-28 19:58:13 +0100
commitfb6ff2a593e1e1f3e448c88f1f34ded8a335092c (patch)
treef726d9eccb7e6afefb4d23e218c5c54b2b378db4 /src/nvim/eval.c
parent924dd6f14a5c7e2964f12ab0724ea6f70d49dff9 (diff)
downloadrneovim-fb6ff2a593e1e1f3e448c88f1f34ded8a335092c.tar.gz
rneovim-fb6ff2a593e1e1f3e448c88f1f34ded8a335092c.tar.bz2
rneovim-fb6ff2a593e1e1f3e448c88f1f34ded8a335092c.zip
lint
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c95
1 files changed, 44 insertions, 51 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 3fb19ad153..bfe9b2dbdd 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -10404,21 +10404,18 @@ static void f_gettabwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
getwinvar(argvars, rettv, 1);
}
-/*
- * "gettagstack()" function
- */
- static void
-f_gettagstack(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+// "gettagstack()" function
+static void f_gettagstack(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
- win_T *wp = curwin; // default is current window
+ win_T *wp = curwin; // default is current window
tv_dict_alloc_ret(rettv);
- if (argvars[0].v_type != VAR_UNKNOWN)
- {
- wp = find_win_by_nr_or_id(&argvars[0]);
- if (wp == NULL)
- return;
+ if (argvars[0].v_type != VAR_UNKNOWN) {
+ wp = find_win_by_nr_or_id(&argvars[0]);
+ if (wp == NULL) {
+ return;
+ }
}
get_tagstack(wp, rettv->vval.v_dict);
@@ -15216,62 +15213,58 @@ static void f_settabwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
setwinvar(argvars, rettv, 1);
}
-/*
- * "settagstack()" function
- */
- static void
-f_settagstack(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+// "settagstack()" function
+static void f_settagstack(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{
static char *e_invact2 = N_("E962: Invalid action: '%s'");
- win_T *wp;
- dict_T *d;
- int action = 'r';
+ win_T *wp;
+ dict_T *d;
+ int action = 'r';
rettv->vval.v_number = -1;
// first argument: window number or id
wp = find_win_by_nr_or_id(&argvars[0]);
- if (wp == NULL)
- return;
+ if (wp == NULL) {
+ return;
+ }
// second argument: dict with items to set in the tag stack
- if (argvars[1].v_type != VAR_DICT)
- {
- EMSG(_(e_dictreq));
- return;
+ if (argvars[1].v_type != VAR_DICT) {
+ EMSG(_(e_dictreq));
+ return;
}
d = argvars[1].vval.v_dict;
- if (d == NULL)
- return;
+ if (d == NULL) {
+ return;
+ }
// third argument: action - 'a' for append and 'r' for replace.
// default is to replace the stack.
- if (argvars[2].v_type == VAR_UNKNOWN)
- action = 'r';
- else if (argvars[2].v_type == VAR_STRING)
- {
- const char *actstr;
- actstr = tv_get_string_chk(&argvars[2]);
- if (actstr == NULL)
- return;
- if ((*actstr == 'r' || *actstr == 'a') && actstr[1] == NUL)
- action = *actstr;
- else
- {
- EMSG2(_(e_invact2), actstr);
- return;
- }
- }
- else
- {
- EMSG(_(e_stringreq));
- return;
+ if (argvars[2].v_type == VAR_UNKNOWN) {
+ action = 'r';
+ } else if (argvars[2].v_type == VAR_STRING) {
+ const char *actstr;
+ actstr = tv_get_string_chk(&argvars[2]);
+ if (actstr == NULL) {
+ return;
+ }
+ if ((*actstr == 'r' || *actstr == 'a') && actstr[1] == NUL) {
+ action = *actstr;
+ } else {
+ EMSG2(_(e_invact2), actstr);
+ return;
+ }
+ } else {
+ EMSG(_(e_stringreq));
+ return;
}
- if (set_tagstack(wp, d, action) == OK)
- rettv->vval.v_number = 0;
- else
- EMSG(_(e_listreq));
+ if (set_tagstack(wp, d, action) == OK) {
+ rettv->vval.v_number = 0;
+ } else {
+ EMSG(_(e_listreq));
+ }
}
/*