Expose a single process_wait()
There were two versions: process_wait() and process_wait_noclose(). Expose a single version with a flag (it was already implemented that way internally).
This commit is contained in:
@@ -121,8 +121,8 @@ process_terminate(pid_t pid) {
|
||||
return kill(pid, SIGTERM) != -1;
|
||||
}
|
||||
|
||||
static exit_code_t
|
||||
process_wait_internal(pid_t pid, bool close) {
|
||||
exit_code_t
|
||||
process_wait(pid_t pid, bool close) {
|
||||
int code;
|
||||
int options = WEXITED;
|
||||
if (!close) {
|
||||
@@ -140,19 +140,9 @@ process_wait_internal(pid_t pid, bool close) {
|
||||
return code;
|
||||
}
|
||||
|
||||
exit_code_t
|
||||
process_wait(pid_t pid) {
|
||||
return process_wait_internal(pid, true);
|
||||
}
|
||||
|
||||
exit_code_t
|
||||
process_wait_noclose(pid_t pid) {
|
||||
return process_wait_internal(pid, false);
|
||||
}
|
||||
|
||||
void
|
||||
process_close(pid_t pid) {
|
||||
process_wait_internal(pid, true); // ignore exit code
|
||||
process_wait(pid, true); // ignore exit code
|
||||
}
|
||||
|
||||
char *
|
||||
|
||||
@@ -59,8 +59,8 @@ process_terminate(HANDLE handle) {
|
||||
return TerminateProcess(handle, 1);
|
||||
}
|
||||
|
||||
static exit_code_t
|
||||
process_wait_internal(HANDLE handle, bool close) {
|
||||
exit_code_t
|
||||
process_wait(HANDLE handle, bool close) {
|
||||
DWORD code;
|
||||
if (WaitForSingleObject(handle, INFINITE) != WAIT_OBJECT_0
|
||||
|| !GetExitCodeProcess(handle, &code)) {
|
||||
@@ -73,16 +73,6 @@ process_wait_internal(HANDLE handle, bool close) {
|
||||
return code;
|
||||
}
|
||||
|
||||
exit_code_t
|
||||
process_wait(HANDLE handle) {
|
||||
return process_wait_internal(handle, true);
|
||||
}
|
||||
|
||||
exit_code_t
|
||||
process_wait_noclose(HANDLE handle) {
|
||||
return process_wait_internal(handle, false);
|
||||
}
|
||||
|
||||
void
|
||||
process_close(HANDLE handle) {
|
||||
bool closed = CloseHandle(handle);
|
||||
|
||||
Reference in New Issue
Block a user