aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2019-11-16 13:16:52 +0900
committerBjörn Linse <bjorn.linse@gmail.com>2020-01-17 11:36:28 +0100
commit60c7eabb2feeb95f405deca6680bdd59113edcaa (patch)
tree56963404cc41b4d7ed84c7a63b73b8647c96de65
parent59ae38a9196d596e2fe511eeb216e314bfc3dac7 (diff)
downloadrneovim-60c7eabb2feeb95f405deca6680bdd59113edcaa.tar.gz
rneovim-60c7eabb2feeb95f405deca6680bdd59113edcaa.tar.bz2
rneovim-60c7eabb2feeb95f405deca6680bdd59113edcaa.zip
Change enum to a name that follows naming convention
-rw-r--r--src/nvim/os/pty_process_win.c14
-rw-r--r--src/nvim/os/pty_process_win.h10
2 files changed, 12 insertions, 12 deletions
diff --git a/src/nvim/os/pty_process_win.c b/src/nvim/os/pty_process_win.c
index 0cd730401a..7108d9c049 100644
--- a/src/nvim/os/pty_process_win.c
+++ b/src/nvim/os/pty_process_win.c
@@ -24,7 +24,7 @@ static void CALLBACK pty_process_finish1(void *context, BOOLEAN unused)
PtyProcess *ptyproc = (PtyProcess *)context;
Process *proc = (Process *)ptyproc;
- if (ptyproc->type == PTY_TYPE_CONPTY
+ if (ptyproc->type == kConpty
&& ptyproc->object.conpty != NULL) {
os_conpty_free(ptyproc->object.conpty);
ptyproc->object.conpty = NULL;
@@ -61,11 +61,11 @@ int pty_process_spawn(PtyProcess *ptyproc)
if ((conpty_object =
os_conpty_init(&in_name, &out_name,
ptyproc->width, ptyproc->height)) != NULL) {
- ptyproc->type = PTY_TYPE_CONPTY;
+ ptyproc->type = kConpty;
}
}
- if (ptyproc->type == PTY_TYPE_WINPTY) {
+ if (ptyproc->type == kWinpty) {
cfg = winpty_config_new(WINPTY_FLAG_ALLOW_CURPROC_DESKTOP_CREATION, &err);
if (cfg == NULL) {
emsg = "winpty_config_new failed";
@@ -125,7 +125,7 @@ int pty_process_spawn(PtyProcess *ptyproc)
goto cleanup;
}
- if (ptyproc->type == PTY_TYPE_CONPTY) {
+ if (ptyproc->type == kConpty) {
if (!os_conpty_spawn(conpty_object,
&process_handle,
NULL,
@@ -183,7 +183,7 @@ int pty_process_spawn(PtyProcess *ptyproc)
uv_run(&proc->loop->uv, UV_RUN_ONCE);
}
- (ptyproc->type == PTY_TYPE_CONPTY) ?
+ (ptyproc->type == kConpty) ?
(void *)(ptyproc->object.conpty = conpty_object) :
(void *)(ptyproc->object.winpty = winpty_object);
ptyproc->process_handle = process_handle;
@@ -227,7 +227,7 @@ void pty_process_resize(PtyProcess *ptyproc, uint16_t width,
uint16_t height)
FUNC_ATTR_NONNULL_ALL
{
- if (ptyproc->type == PTY_TYPE_CONPTY
+ if (ptyproc->type == kConpty
&& ptyproc->object.conpty != NULL) {
os_conpty_set_size(ptyproc->object.conpty, width, height);
} else if (ptyproc->object.winpty != NULL) {
@@ -250,7 +250,7 @@ void pty_process_close(PtyProcess *ptyproc)
void pty_process_close_master(PtyProcess *ptyproc)
FUNC_ATTR_NONNULL_ALL
{
- if (ptyproc->type == PTY_TYPE_WINPTY
+ if (ptyproc->type == kWinpty
&& ptyproc->object.winpty != NULL) {
winpty_free(ptyproc->object.winpty);
ptyproc->object.winpty = NULL;
diff --git a/src/nvim/os/pty_process_win.h b/src/nvim/os/pty_process_win.h
index c7eaa23b1b..04c8439c6c 100644
--- a/src/nvim/os/pty_process_win.h
+++ b/src/nvim/os/pty_process_win.h
@@ -9,9 +9,9 @@
#include "nvim/os/os_win_conpty.h"
typedef enum {
- PTY_TYPE_WINPTY,
- PTY_TYPE_CONPTY
-} pty_type_t;
+ kWinpty,
+ kConpty
+} PtyType;
typedef struct pty_process {
Process process;
@@ -21,7 +21,7 @@ typedef struct pty_process {
winpty_t *winpty;
conpty_t *conpty;
} object;
- pty_type_t type;
+ PtyType type;
HANDLE finish_wait;
HANDLE process_handle;
uv_timer_t wait_eof_timer;
@@ -41,7 +41,7 @@ static inline PtyProcess pty_process_init(Loop *loop, void *data)
rv.width = 80;
rv.height = 24;
rv.object.winpty = NULL;
- rv.type = PTY_TYPE_WINPTY;
+ rv.type = kWinpty;
rv.finish_wait = NULL;
rv.process_handle = NULL;
return rv;