Skip to content
Snippets Groups Projects
Commit e1579978 authored by Alexander Turenko's avatar Alexander Turenko Committed by Kirill Yukhin
Browse files

popen: remove retval from popen_state()


After the previous commit ('popen: require popen handle to be non-NULL')
it turns out that popen_state() function always succeeds. There is no
reason to return a success / failure value from it.

Part of #4031

Acked-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
parent 922cef65
No related branches found
No related tags found
No related merge requests found
......@@ -374,7 +374,7 @@ popen_sigchld_handler(EV_P_ ev_child *w, int revents)
/**
* Get current child state.
*/
int
void
popen_state(struct popen_handle *handle, int *state, int *exit_code)
{
assert(handle != NULL);
......@@ -391,8 +391,6 @@ popen_state(struct popen_handle *handle, int *state, int *exit_code)
*exit_code = WTERMSIG(handle->wstatus);
}
}
return 0;
}
/**
......
......@@ -163,7 +163,7 @@ popen_read_timeout(struct popen_handle *handle, void *buf,
size_t count, unsigned int flags,
ev_tstamp timeout);
extern int
extern void
popen_state(struct popen_handle *handle, int *state, int *exit_code);
extern const char *
......
......@@ -26,8 +26,7 @@ static int
wait_exit(struct popen_handle *handle, int *state, int *exit_code)
{
for (;;) {
if (popen_state(handle, state, exit_code))
return -1;
popen_state(handle, state, exit_code);
if (*state == POPEN_STATE_EXITED ||
*state == POPEN_STATE_SIGNALED)
break;
......@@ -61,7 +60,7 @@ popen_write_exit(void)
};
int rc;
plan(7);
plan(6);
header();
handle = popen_new(&opts);
......@@ -69,8 +68,7 @@ popen_write_exit(void)
if (handle == NULL)
goto out;
rc = popen_state(handle, &state, &exit_code);
ok(rc == 0, "popen_state");
popen_state(handle, &state, &exit_code);
ok(state == POPEN_STATE_ALIVE, "state %s",
popen_state_str(state));
......
1..3
*** main_f ***
1..7
1..6
*** popen_write_exit ***
ok 1 - popen_new
ok 2 - popen_state
ok 3 - state alive
ok 4 - write flag check
ok 5 - write to pipe
ok 6 - child exited
ok 7 - popen_delete
ok 2 - state alive
ok 3 - write flag check
ok 4 - write to pipe
ok 5 - child exited
ok 6 - popen_delete
*** popen_write_exit: done ***
ok 1 - subtests
1..5
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment