diff options
author | Gregory Anders <greg@gpanders.com> | 2021-07-12 11:55:20 -0600 |
---|---|---|
committer | Gregory Anders <greg@gpanders.com> | 2021-07-12 12:17:44 -0600 |
commit | 35e13df3c871e993f4d9b332985d9a9525f4ca00 (patch) | |
tree | a5be4635fa499bba48b3e5ac3feba82acc5bbc9a | |
parent | eb7f24b4ae369086a2bb26966758069e63edeee1 (diff) | |
download | rneovim-35e13df3c871e993f4d9b332985d9a9525f4ca00.tar.gz rneovim-35e13df3c871e993f4d9b332985d9a9525f4ca00.tar.bz2 rneovim-35e13df3c871e993f4d9b332985d9a9525f4ca00.zip |
Rename stdin to stdin_mode
stdin is a macro in Windows builds.
-rw-r--r-- | src/nvim/channel.c | 10 | ||||
-rw-r--r-- | src/nvim/eval/funcs.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/nvim/channel.c b/src/nvim/channel.c index ffa4d12d11..a0db1bcdfd 100644 --- a/src/nvim/channel.c +++ b/src/nvim/channel.c @@ -289,9 +289,9 @@ static void close_cb(Stream *stream, void *data) /// `on_stdout` is ignored /// @param[in] detach True if the job should not be killed when nvim exits, /// ignored if `pty` is true -/// @param[in] stdin Stdin mode. Either kChannelStdinPipe to open a channel -/// for stdin or kChannelStdinNull to leave stdin -/// disconnected. +/// @param[in] stdin_mode Stdin mode. Either kChannelStdinPipe to open a +/// channel for stdin or kChannelStdinNull to leave +/// stdin disconnected. /// @param[in] cwd Initial working directory for the job. Nvim's working /// directory if `cwd` is NULL /// @param[in] pty_width Width of the pty, ignored if `pty` is false @@ -305,7 +305,7 @@ static void close_cb(Stream *stream, void *data) Channel *channel_job_start(char **argv, CallbackReader on_stdout, CallbackReader on_stderr, Callback on_exit, bool pty, bool rpc, bool overlapped, bool detach, - ChannelStdinMode stdin, const char *cwd, + ChannelStdinMode stdin_mode, const char *cwd, uint16_t pty_width, uint16_t pty_height, dict_T *env, varnumber_T *status_out) { @@ -357,7 +357,7 @@ Channel *channel_job_start(char **argv, CallbackReader on_stdout, has_err = callback_reader_set(chan->on_stderr); } - switch (stdin) { + switch (stdin_mode) { case kChannelStdinPipe: has_in = true; break; diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 20434a937e..0c9b717b0b 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -5182,7 +5182,7 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, FunPtr fptr) bool pty = false; bool clear_env = false; bool overlapped = false; - ChannelStdinMode stdin = kChannelStdinPipe; + ChannelStdinMode stdin_mode = kChannelStdinPipe; CallbackReader on_stdout = CALLBACK_READER_INIT, on_stderr = CALLBACK_READER_INIT; Callback on_exit = CALLBACK_NONE; @@ -5200,7 +5200,7 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, FunPtr fptr) char *s = tv_dict_get_string(job_opts, "stdin", false); if (s) { if (!strncmp(s, "null", NUMBUFLEN)) { - stdin = kChannelStdinNull; + stdin_mode = kChannelStdinNull; } else if (!strncmp(s, "pipe", NUMBUFLEN)) { // Nothing to do, default value } else { @@ -5264,7 +5264,7 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv, FunPtr fptr) env = create_environment(job_env, clear_env, pty, term_name); Channel *chan = channel_job_start(argv, on_stdout, on_stderr, on_exit, pty, - rpc, overlapped, detach, stdin, cwd, width, + rpc, overlapped, detach, stdin_mode, cwd, width, height, env, &rettv->vval.v_number); if (chan) { channel_create_event(chan, NULL); @@ -10863,11 +10863,11 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr) const bool rpc = false; const bool overlapped = false; const bool detach = false; - ChannelStdinMode stdin = kChannelStdinPipe; + ChannelStdinMode stdin_mode = kChannelStdinPipe; uint16_t term_width = MAX(0, curwin->w_width_inner - win_col_off(curwin)); Channel *chan = channel_job_start(argv, on_stdout, on_stderr, on_exit, - pty, rpc, overlapped, detach, stdin, cwd, - term_width, curwin->w_height_inner, + pty, rpc, overlapped, detach, stdin_mode, + cwd, term_width, curwin->w_height_inner, env, &rettv->vval.v_number); if (rettv->vval.v_number <= 0) { return; |