diff --git a/README.md b/README.md index 7e049c8..bb53afa 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,9 @@ int main(void) { uvwasi_errno_t err; /* Setup the initialization options. */ - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 3; init_options.argv = calloc(3, sizeof(char*)); @@ -150,9 +150,9 @@ typedef struct uvwasi_options_s { size_t argc; char** argv; char** envp; - uvwasi_fd_t stdin; - uvwasi_fd_t stdout; - uvwasi_fd_t stderr; + uvwasi_fd_t in; + uvwasi_fd_t out; + uvwasi_fd_t err; const uvwasi_mem_t* allocator; } uvwasi_options_t; ``` diff --git a/include/uvwasi.h b/include/uvwasi.h index 44de573..4aa15e7 100644 --- a/include/uvwasi.h +++ b/include/uvwasi.h @@ -60,9 +60,9 @@ typedef struct uvwasi_options_s { size_t argc; char** argv; char** envp; - uvwasi_fd_t stdin; - uvwasi_fd_t stdout; - uvwasi_fd_t stderr; + uvwasi_fd_t in; + uvwasi_fd_t out; + uvwasi_fd_t err; const uvwasi_mem_t* allocator; } uvwasi_options_t; diff --git a/src/fd_table.c b/src/fd_table.c index 1b636e4..f6e530d 100644 --- a/src/fd_table.c +++ b/src/fd_table.c @@ -190,15 +190,15 @@ uvwasi_errno_t uvwasi_fd_table_init(uvwasi_t* uvwasi, } /* Create the stdio FDs. */ - err = uvwasi__insert_stdio(uvwasi, table, options->stdin, 0, ""); + err = uvwasi__insert_stdio(uvwasi, table, options->in, 0, ""); if (err != UVWASI_ESUCCESS) goto error_exit; - err = uvwasi__insert_stdio(uvwasi, table, options->stdout, 1, ""); + err = uvwasi__insert_stdio(uvwasi, table, options->out, 1, ""); if (err != UVWASI_ESUCCESS) goto error_exit; - err = uvwasi__insert_stdio(uvwasi, table, options->stderr, 2, ""); + err = uvwasi__insert_stdio(uvwasi, table, options->err, 2, ""); if (err != UVWASI_ESUCCESS) goto error_exit; diff --git a/test/test-args-get.c b/test/test-args-get.c index 715ac95..6973975 100644 --- a/test/test-args-get.c +++ b/test/test-args-get.c @@ -12,9 +12,9 @@ int main(void) { char** args_get_argv; char* buf; - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 3; init_options.argv = calloc(3, sizeof(char*)); diff --git a/test/test-basic-file-io.c b/test/test-basic-file-io.c index 67be3f4..492408c 100644 --- a/test/test-basic-file-io.c +++ b/test/test-basic-file-io.c @@ -29,9 +29,9 @@ int main(void) { uv_fs_req_cleanup(&req); assert(r == 0 || r == UV_EEXIST); - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-ebadf-input-validation.c b/test/test-ebadf-input-validation.c index 2c7f316..31662da 100644 --- a/test/test-ebadf-input-validation.c +++ b/test/test-ebadf-input-validation.c @@ -22,9 +22,9 @@ int main(void) { test_void = (void*) &test_fdstat; - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-environ-get.c b/test/test-environ-get.c index 3af684e..aa7cc23 100644 --- a/test/test-environ-get.c +++ b/test/test-environ-get.c @@ -20,9 +20,9 @@ int main(void) { char* buf; size_t i; - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-fd-prestat-dir-name.c b/test/test-fd-prestat-dir-name.c index 3e99a97..800f4a8 100644 --- a/test/test-fd-prestat-dir-name.c +++ b/test/test-fd-prestat-dir-name.c @@ -19,9 +19,9 @@ int main(void) { uv_fs_req_cleanup(&req); assert(r == 0 || r == UV_EEXIST); - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-multiple-wasi-destroys.c b/test/test-multiple-wasi-destroys.c index 6d37a48..b1ad17b 100644 --- a/test/test-multiple-wasi-destroys.c +++ b/test/test-multiple-wasi-destroys.c @@ -8,9 +8,9 @@ int main(void) { uvwasi_options_t init_options; uvwasi_errno_t err; - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-path-create-remove-directory.c b/test/test-path-create-remove-directory.c index eca154d..b59114a 100644 --- a/test/test-path-create-remove-directory.c +++ b/test/test-path-create-remove-directory.c @@ -21,9 +21,9 @@ int main(void) { uv_fs_req_cleanup(&req); assert(r == 0 || r == UV_ENOENT); - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL; diff --git a/test/test-random-get.c b/test/test-random-get.c index 7ee7347..5bfd14f 100644 --- a/test/test-random-get.c +++ b/test/test-random-get.c @@ -13,9 +13,9 @@ int main(void) { int success; int i; - init_options.stdin = 0; - init_options.stdout = 1; - init_options.stderr = 2; + init_options.in = 0; + init_options.out = 1; + init_options.err = 2; init_options.fd_table_size = 3; init_options.argc = 0; init_options.argv = NULL;