rename std* for Windows

Windows doesn't seem to like the use of stdin, stdout, or stderr as struct members.
nodejs · Mar 14, 2020 · 28f2e31 · 28f2e31
1 parent e115a62
commit 28f2e31
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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, "<stdin>");
+  err = uvwasi__insert_stdio(uvwasi, table, options->in, 0, "<stdin>");
   if (err != UVWASI_ESUCCESS)
     goto error_exit;
 
-  err = uvwasi__insert_stdio(uvwasi, table, options->stdout, 1, "<stdout>");
+  err = uvwasi__insert_stdio(uvwasi, table, options->out, 1, "<stdout>");
   if (err != UVWASI_ESUCCESS)
     goto error_exit;
 
-  err = uvwasi__insert_stdio(uvwasi, table, options->stderr, 2, "<stderr>");
+  err = uvwasi__insert_stdio(uvwasi, table, options->err, 2, "<stderr>");
   if (err != UVWASI_ESUCCESS)
     goto error_exit;
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;