diff options
author | Craig Tiller <ctiller@google.com> | 2017-11-08 09:42:32 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-11-08 09:42:32 -0800 |
commit | 660d4aa2d281dbfbc6c3a3e3349b3e4b6a444285 (patch) | |
tree | 592cecc1d6670bb12b9af81c19cd3cb98cc0eeef /src/core/lib/support/subprocess_windows.cc | |
parent | 48d26966646e910f7dd63d428ef831178ca9315e (diff) | |
parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) |
Merge github.com:grpc/grpc into tfix2
Diffstat (limited to 'src/core/lib/support/subprocess_windows.cc')
-rw-r--r-- | src/core/lib/support/subprocess_windows.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/lib/support/subprocess_windows.cc b/src/core/lib/support/subprocess_windows.cc index 6769f1d3a4..dcdafb5a63 100644 --- a/src/core/lib/support/subprocess_windows.cc +++ b/src/core/lib/support/subprocess_windows.cc @@ -36,16 +36,16 @@ struct gpr_subprocess { int interrupted; }; -const char *gpr_subprocess_binary_extension() { return ".exe"; } +const char* gpr_subprocess_binary_extension() { return ".exe"; } -gpr_subprocess *gpr_subprocess_create(int argc, const char **argv) { - gpr_subprocess *r; +gpr_subprocess* gpr_subprocess_create(int argc, const char** argv) { + gpr_subprocess* r; STARTUPINFO si; PROCESS_INFORMATION pi; - char *args = gpr_strjoin_sep(argv, (size_t)argc, " ", NULL); - TCHAR *args_tchar; + char* args = gpr_strjoin_sep(argv, (size_t)argc, " ", NULL); + TCHAR* args_tchar; args_tchar = gpr_char_to_tchar(args); gpr_free(args); @@ -61,13 +61,13 @@ gpr_subprocess *gpr_subprocess_create(int argc, const char **argv) { } gpr_free(args_tchar); - r = (gpr_subprocess *)gpr_malloc(sizeof(gpr_subprocess)); + r = (gpr_subprocess*)gpr_malloc(sizeof(gpr_subprocess)); memset(r, 0, sizeof(*r)); r->pi = pi; return r; } -void gpr_subprocess_destroy(gpr_subprocess *p) { +void gpr_subprocess_destroy(gpr_subprocess* p) { if (p) { if (!p->joined) { gpr_subprocess_interrupt(p); @@ -83,7 +83,7 @@ void gpr_subprocess_destroy(gpr_subprocess *p) { } } -int gpr_subprocess_join(gpr_subprocess *p) { +int gpr_subprocess_join(gpr_subprocess* p) { DWORD dwExitCode; if (GetExitCodeProcess(p->pi.hProcess, &dwExitCode)) { if (dwExitCode == STILL_ACTIVE) { @@ -110,7 +110,7 @@ getExitCode: } } -void gpr_subprocess_interrupt(gpr_subprocess *p) { +void gpr_subprocess_interrupt(gpr_subprocess* p) { DWORD dwExitCode; if (GetExitCodeProcess(p->pi.hProcess, &dwExitCode)) { if (dwExitCode == STILL_ACTIVE) { |