diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2014-03-13 00:08:29 +0100 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-04-07 16:37:20 +0400 |
| commit | 42b93437102e63ded3e09bbeb24dc96d5b1b62f6 (patch) | |
| tree | 07b065cd4f65696bae6fecd5606acffd44ad63c1 /src/spawn_sync.cc | |
| parent | 962f96d3416ee00c78e729bc1c1b05e02d0c1ef2 (diff) | |
| download | android-node-v8-42b93437102e63ded3e09bbeb24dc96d5b1b62f6.tar.gz android-node-v8-42b93437102e63ded3e09bbeb24dc96d5b1b62f6.tar.bz2 android-node-v8-42b93437102e63ded3e09bbeb24dc96d5b1b62f6.zip | |
src: update uv callbacks after API changes
async, timer, prepare, idle and check handles no longer get a status
parameter since they can never fail.
Diffstat (limited to 'src/spawn_sync.cc')
| -rw-r--r-- | src/spawn_sync.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc index 73d821ae75..481d0eff09 100644 --- a/src/spawn_sync.cc +++ b/src/spawn_sync.cc @@ -617,8 +617,7 @@ void SyncProcessRunner::OnExit(int64_t exit_status, int term_signal) { } -void SyncProcessRunner::OnKillTimerTimeout(int status) { - assert(status == 0); +void SyncProcessRunner::OnKillTimerTimeout() { SetError(UV_ETIMEDOUT); Kill(); } @@ -1037,9 +1036,9 @@ void SyncProcessRunner::ExitCallback(uv_process_t* handle, } -void SyncProcessRunner::KillTimerCallback(uv_timer_t* handle, int status) { +void SyncProcessRunner::KillTimerCallback(uv_timer_t* handle) { SyncProcessRunner* self = reinterpret_cast<SyncProcessRunner*>(handle->data); - self->OnKillTimerTimeout(status); + self->OnKillTimerTimeout(); } |