Skip to content

Commit 28f2e31

Browse files
cjihrigcjihrig
committed
rename std* for Windows
Windows doesn't seem to like the use of stdin, stdout, or stderr as struct members.
1 parent e115a62 commit 28f2e31

11 files changed

+36
-36
lines changed

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ int main(void) {
2727
uvwasi_errno_t err;
2828

2929
/* Setup the initialization options. */
30-
init_options.stdin = 0;
31-
init_options.stdout = 1;
32-
init_options.stderr = 2;
30+
init_options.in = 0;
31+
init_options.out = 1;
32+
init_options.err = 2;
3333
init_options.fd_table_size = 3;
3434
init_options.argc = 3;
3535
init_options.argv = calloc(3, sizeof(char*));
@@ -150,9 +150,9 @@ typedef struct uvwasi_options_s {
150150
size_t argc;
151151
char** argv;
152152
char** envp;
153-
uvwasi_fd_t stdin;
154-
uvwasi_fd_t stdout;
155-
uvwasi_fd_t stderr;
153+
uvwasi_fd_t in;
154+
uvwasi_fd_t out;
155+
uvwasi_fd_t err;
156156
const uvwasi_mem_t* allocator;
157157
} uvwasi_options_t;
158158
```

‎include/uvwasi.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ typedef struct uvwasi_options_s {
6060
size_t argc;
6161
char** argv;
6262
char** envp;
63-
uvwasi_fd_t stdin;
64-
uvwasi_fd_t stdout;
65-
uvwasi_fd_t stderr;
63+
uvwasi_fd_t in;
64+
uvwasi_fd_t out;
65+
uvwasi_fd_t err;
6666
const uvwasi_mem_t* allocator;
6767
} uvwasi_options_t;
6868

‎src/fd_table.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ uvwasi_errno_t uvwasi_fd_table_init(uvwasi_t* uvwasi,
190190
}
191191

192192
/* Create the stdio FDs. */
193-
err = uvwasi__insert_stdio(uvwasi, table, options->stdin, 0, "<stdin>");
193+
err = uvwasi__insert_stdio(uvwasi, table, options->in, 0, "<stdin>");
194194
if (err != UVWASI_ESUCCESS)
195195
goto error_exit;
196196

197-
err = uvwasi__insert_stdio(uvwasi, table, options->stdout, 1, "<stdout>");
197+
err = uvwasi__insert_stdio(uvwasi, table, options->out, 1, "<stdout>");
198198
if (err != UVWASI_ESUCCESS)
199199
goto error_exit;
200200

201-
err = uvwasi__insert_stdio(uvwasi, table, options->stderr, 2, "<stderr>");
201+
err = uvwasi__insert_stdio(uvwasi, table, options->err, 2, "<stderr>");
202202
if (err != UVWASI_ESUCCESS)
203203
goto error_exit;
204204

‎test/test-args-get.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ int main(void) {
1212
char** args_get_argv;
1313
char* buf;
1414

15-
init_options.stdin = 0;
16-
init_options.stdout = 1;
17-
init_options.stderr = 2;
15+
init_options.in = 0;
16+
init_options.out = 1;
17+
init_options.err = 2;
1818
init_options.fd_table_size = 3;
1919
init_options.argc = 3;
2020
init_options.argv = calloc(3, sizeof(char*));

‎test/test-basic-file-io.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ int main(void) {
2929
uv_fs_req_cleanup(&req);
3030
assert(r == 0 || r == UV_EEXIST);
3131

32-
init_options.stdin = 0;
33-
init_options.stdout = 1;
34-
init_options.stderr = 2;
32+
init_options.in = 0;
33+
init_options.out = 1;
34+
init_options.err = 2;
3535
init_options.fd_table_size = 3;
3636
init_options.argc = 0;
3737
init_options.argv = NULL;

‎test/test-ebadf-input-validation.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ int main(void) {
2222

2323
test_void = (void*) &test_fdstat;
2424

25-
init_options.stdin = 0;
26-
init_options.stdout = 1;
27-
init_options.stderr = 2;
25+
init_options.in = 0;
26+
init_options.out = 1;
27+
init_options.err = 2;
2828
init_options.fd_table_size = 3;
2929
init_options.argc = 0;
3030
init_options.argv = NULL;

‎test/test-environ-get.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ int main(void) {
2020
char* buf;
2121
size_t i;
2222

23-
init_options.stdin = 0;
24-
init_options.stdout = 1;
25-
init_options.stderr = 2;
23+
init_options.in = 0;
24+
init_options.out = 1;
25+
init_options.err = 2;
2626
init_options.fd_table_size = 3;
2727
init_options.argc = 0;
2828
init_options.argv = NULL;

‎test/test-fd-prestat-dir-name.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ int main(void) {
1919
uv_fs_req_cleanup(&req);
2020
assert(r == 0 || r == UV_EEXIST);
2121

22-
init_options.stdin = 0;
23-
init_options.stdout = 1;
24-
init_options.stderr = 2;
22+
init_options.in = 0;
23+
init_options.out = 1;
24+
init_options.err = 2;
2525
init_options.fd_table_size = 3;
2626
init_options.argc = 0;
2727
init_options.argv = NULL;

‎test/test-multiple-wasi-destroys.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ int main(void) {
88
uvwasi_options_t init_options;
99
uvwasi_errno_t err;
1010

11-
init_options.stdin = 0;
12-
init_options.stdout = 1;
13-
init_options.stderr = 2;
11+
init_options.in = 0;
12+
init_options.out = 1;
13+
init_options.err = 2;
1414
init_options.fd_table_size = 3;
1515
init_options.argc = 0;
1616
init_options.argv = NULL;

‎test/test-path-create-remove-directory.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ int main(void) {
2121
uv_fs_req_cleanup(&req);
2222
assert(r == 0 || r == UV_ENOENT);
2323

24-
init_options.stdin = 0;
25-
init_options.stdout = 1;
26-
init_options.stderr = 2;
24+
init_options.in = 0;
25+
init_options.out = 1;
26+
init_options.err = 2;
2727
init_options.fd_table_size = 3;
2828
init_options.argc = 0;
2929
init_options.argv = NULL;

0 commit comments

Comments
 (0)