aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval
diff options
context:
space:
mode:
authordundargoc <gocdundar@gmail.com>2023-12-16 22:14:28 +0100
committerdundargoc <33953936+dundargoc@users.noreply.github.com>2023-12-18 16:22:13 +0100
commit6cb78e2d1c4c6c63c628c965076a07ce5f7adbb6 (patch)
tree20bfbe8b317fde86121fcf9af10975b2b95e5758 /src/nvim/eval
parent8c173cec295cf8c78bdbc440dc87f0473560f69a (diff)
downloadrneovim-6cb78e2d1c4c6c63c628c965076a07ce5f7adbb6.tar.gz
rneovim-6cb78e2d1c4c6c63c628c965076a07ce5f7adbb6.tar.bz2
rneovim-6cb78e2d1c4c6c63c628c965076a07ce5f7adbb6.zip
docs: add style rule regarding initialization
Specifically, specify that each initialization should be done on a separate line.
Diffstat (limited to 'src/nvim/eval')
-rw-r--r--src/nvim/eval/funcs.c11
-rw-r--r--src/nvim/eval/userfunc.c6
-rw-r--r--src/nvim/eval/window.c3
3 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
index ea68c010d6..81ae208560 100644
--- a/src/nvim/eval/funcs.c
+++ b/src/nvim/eval/funcs.c
@@ -4054,8 +4054,8 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
bool clear_env = false;
bool overlapped = false;
ChannelStdinMode stdin_mode = kChannelStdinPipe;
- CallbackReader on_stdout = CALLBACK_READER_INIT,
- on_stderr = CALLBACK_READER_INIT;
+ CallbackReader on_stdout = CALLBACK_READER_INIT;
+ CallbackReader on_stderr = CALLBACK_READER_INIT;
Callback on_exit = CALLBACK_NONE;
char *cwd = NULL;
dictitem_T *job_env = NULL;
@@ -4118,7 +4118,8 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
}
}
- uint16_t width = 0, height = 0;
+ uint16_t width = 0;
+ uint16_t height = 0;
char *term_name = NULL;
if (pty) {
@@ -8553,8 +8554,8 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
- CallbackReader on_stdout = CALLBACK_READER_INIT,
- on_stderr = CALLBACK_READER_INIT;
+ CallbackReader on_stdout = CALLBACK_READER_INIT;
+ CallbackReader on_stderr = CALLBACK_READER_INIT;
Callback on_exit = CALLBACK_NONE;
dict_T *job_opts = NULL;
const char *cwd = ".";
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
index ebc84922cb..cce02e6daf 100644
--- a/src/nvim/eval/userfunc.c
+++ b/src/nvim/eval/userfunc.c
@@ -105,7 +105,6 @@ static int get_function_args(char **argp, char endchar, garray_T *newargs, int *
char *arg = *argp;
char *p = arg;
uint8_t c;
- int i;
if (newargs != NULL) {
ga_init(newargs, (int)sizeof(char *), 3);
@@ -147,7 +146,7 @@ static int get_function_args(char **argp, char endchar, garray_T *newargs, int *
arg = xstrdup(arg);
// Check for duplicate argument name.
- for (i = 0; i < newargs->ga_len; i++) {
+ for (int i = 0; i < newargs->ga_len; i++) {
if (strcmp(((char **)(newargs->ga_data))[i], arg) == 0) {
semsg(_("E853: Duplicate argument name: %s"), arg);
xfree(arg);
@@ -922,7 +921,6 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
static int depth = 0;
dictitem_T *v;
int fixvar_idx = 0; // index in fc_fixvar[]
- int ai;
bool islambda = false;
char numbuf[NUMBUFLEN];
char *name;
@@ -1025,7 +1023,7 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rett
bool isdefault = false;
typval_T def_rettv;
- ai = i - fp->uf_args.ga_len;
+ int ai = i - fp->uf_args.ga_len;
if (ai < 0) {
// named argument a:name
name = FUNCARG(fp, i);
diff --git a/src/nvim/eval/window.c b/src/nvim/eval/window.c
index d1ee2ea356..02f214f262 100644
--- a/src/nvim/eval/window.c
+++ b/src/nvim/eval/window.c
@@ -710,7 +710,8 @@ void f_win_splitmove(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
return;
}
- int flags = 0, size = 0;
+ int flags = 0;
+ int size = 0;
if (argvars[2].v_type != VAR_UNKNOWN) {
dict_T *d;