diff options
| author | Hans-Werner Hilse <hwhilse@gmail.com> | 2015-06-11 11:29:19 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-06-25 22:42:19 +0200 |
| commit | f9bb3b5947c507d402eecbffabb8fb0864263ad1 (patch) | |
| tree | 82e1167c87b395d3bcb2ef3cd1e73236d1cf9527 /arch/um/drivers/net_user.c | |
| parent | um: Do not use __ptr_t type for stack_t's .ss pointer (diff) | |
| download | linux-f9bb3b5947c507d402eecbffabb8fb0864263ad1.tar.xz linux-f9bb3b5947c507d402eecbffabb8fb0864263ad1.zip | |
um: Do not use stdin and stdout identifiers for struct members
stdin, stdout and stderr are macros according to C89/C99.
Thus do not use them as struct member identifiers to avoid
bad results from macro expansion.
Signed-off-by: Hans-Werner Hilse <hwhilse@gmail.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers/net_user.c')
| -rw-r--r-- | arch/um/drivers/net_user.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c index cd14157b556d..e697a4136707 100644 --- a/arch/um/drivers/net_user.c +++ b/arch/um/drivers/net_user.c @@ -166,7 +166,7 @@ int net_sendto(int fd, void *buf, int len, void *to, int sock_len) struct change_pre_exec_data { int close_me; - int stdout; + int stdout_fd; }; static void change_pre_exec(void *arg) @@ -174,7 +174,7 @@ static void change_pre_exec(void *arg) struct change_pre_exec_data *data = arg; close(data->close_me); - dup2(data->stdout, 1); + dup2(data->stdout_fd, 1); } static int change_tramp(char **argv, char *output, int output_len) @@ -189,7 +189,7 @@ static int change_tramp(char **argv, char *output, int output_len) return err; } pe_data.close_me = fds[0]; - pe_data.stdout = fds[1]; + pe_data.stdout_fd = fds[1]; pid = run_helper(change_pre_exec, &pe_data, argv); if (pid > 0) /* Avoid hang as we won't get data in failure case. */ |