From 09c722e72b59762ca0f01377ad60ada7d16d8558 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 22 Feb 2012 16:05:42 +0100 Subject: [PATCH] common: make uv__set_*_error() return -1 So you can do `if (errno) return uv__set_sys_error(loop, errno);`. --- src/uv-common.c | 9 ++++++--- src/uv-common.h | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/uv-common.c b/src/uv-common.c index 0d1c3633..cb9b6b6f 100644 --- a/src/uv-common.c +++ b/src/uv-common.c @@ -101,20 +101,23 @@ const char* uv_strerror(uv_err_t err) { #undef UV_STRERROR_GEN -void uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error) { +int uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error) { loop->last_err.code = code; loop->last_err.sys_errno_ = sys_error; + return -1; } -void uv__set_sys_error(uv_loop_t* loop, int sys_error) { +int uv__set_sys_error(uv_loop_t* loop, int sys_error) { loop->last_err.code = uv_translate_sys_error(sys_error); loop->last_err.sys_errno_ = sys_error; + return -1; } -void uv__set_artificial_error(uv_loop_t* loop, uv_err_code code) { +int uv__set_artificial_error(uv_loop_t* loop, uv_err_code code) { loop->last_err = uv__new_artificial_error(code); + return -1; } diff --git a/src/uv-common.h b/src/uv-common.h index bb0aba6e..72914ec0 100644 --- a/src/uv-common.h +++ b/src/uv-common.h @@ -51,9 +51,9 @@ int uv_ares_handles_empty(uv_loop_t* loop); extern const uv_err_t uv_ok_; uv_err_code uv_translate_sys_error(int sys_errno); -void uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error); -void uv__set_sys_error(uv_loop_t* loop, int sys_error); -void uv__set_artificial_error(uv_loop_t* loop, uv_err_code code); +int uv__set_error(uv_loop_t* loop, uv_err_code code, int sys_error); +int uv__set_sys_error(uv_loop_t* loop, int sys_error); +int uv__set_artificial_error(uv_loop_t* loop, uv_err_code code); uv_err_t uv__new_sys_error(int sys_error); uv_err_t uv__new_artificial_error(uv_err_code code);