From c320c1ab989cf809da6effb4a47e8355c94357f5 Mon Sep 17 00:00:00 2001 From: Kai Blin Date: Fri, 22 Oct 2010 16:40:38 +0200 Subject: lib/util: Add tevent WERROR wrappers Signed-off-by: Stefan Metzmacher Autobuild-User: Stefan Metzmacher Autobuild-Date: Sat Oct 23 07:35:28 UTC 2010 on sn-devel-104 --- lib/util/tevent_werror.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/util/tevent_werror.h | 43 +++++++++++++++++++++++++ lib/util/wscript_build | 4 +-- 3 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 lib/util/tevent_werror.c create mode 100644 lib/util/tevent_werror.h (limited to 'lib') diff --git a/lib/util/tevent_werror.c b/lib/util/tevent_werror.c new file mode 100644 index 0000000000..d8956b398f --- /dev/null +++ b/lib/util/tevent_werror.c @@ -0,0 +1,81 @@ +/* + Unix SMB/CIFS implementation. + Wrap win32 errors around tevent_req + Copyright (C) Kai Blin 2010 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "../replace/replace.h" +#include "tevent_werror.h" + +bool _tevent_req_werror(struct tevent_req *req, + WERROR werror, + const char *location) +{ + return _tevent_req_error(req, W_ERROR_V(werror), + location); +} + +bool tevent_req_is_werror(struct tevent_req *req, WERROR *error) +{ + enum tevent_req_state state; + uint64_t err; + + if (!tevent_req_is_error(req, &state, &err)) { + return false; + } + switch (state) { + case TEVENT_REQ_TIMED_OUT: + *error = WERR_TIMEOUT; + break; + case TEVENT_REQ_NO_MEMORY: + *error = WERR_NOMEM; + break; + case TEVENT_REQ_USER_ERROR: + *error = W_ERROR(err); + break; + default: + *error = WERR_INTERNAL_ERROR; + break; + } + return true; +} + +WERROR tevent_req_simple_recv_werror(struct tevent_req *req) +{ + WERROR werror; + + if (tevent_req_is_werror(req, &werror)) { + tevent_req_received(req); + return werror; + } + tevent_req_received(req); + return WERR_OK; +} + +void tevent_req_simple_finish_werror(struct tevent_req *subreq, + WERROR subreq_error) +{ + struct tevent_req *req = tevent_req_callback_data( + subreq, struct tevent_req); + + TALLOC_FREE(subreq); + + if (!W_ERROR_IS_OK(subreq_error)) { + tevent_req_werror(req, subreq_error); + return; + } + tevent_req_done(req); +} diff --git a/lib/util/tevent_werror.h b/lib/util/tevent_werror.h new file mode 100644 index 0000000000..0e243825b6 --- /dev/null +++ b/lib/util/tevent_werror.h @@ -0,0 +1,43 @@ +/* + Unix SMB/CIFS implementation. + Wrap win32 errors around tevent_req + Copyright (C) Kai Blin 2010 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _TEVENT_WERROR_H +#define _TEVENT_WERROR_H + +#include +#include +#include "../libcli/util/werror.h" +#include + +bool _tevent_req_werror(struct tevent_req *req, + WERROR werror, + const char *location); +#define tevent_req_werror(req, werror) \ + _tevent_req_werror(req, werror, __location__) +bool tevent_req_is_werror(struct tevent_req *req, WERROR *error); +WERROR tevent_req_simple_recv_werror(struct tevent_req *req); + +/* + * Helper routine to pass the subreq_werror to the req embedded in + * tevent_req_callback_data(subreq), which will be freed. + */ +void tevent_req_simple_finish_werror(struct tevent_req *subreq, + WERROR subreq_error); + +#endif diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 9162bcbba0..e1030c88e9 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -41,10 +41,10 @@ bld.SAMBA_SUBSYSTEM('UTIL_TDB', ) bld.SAMBA_SUBSYSTEM('UTIL_TEVENT', - source='tevent_unix.c tevent_ntstatus.c', + source='tevent_unix.c tevent_ntstatus.c tevent_werror.c', local_include=False, public_deps='tevent', - public_headers='tevent_ntstatus.h tevent_unix.h', + public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h', header_path=[ ('*', 'util') ], ) -- cgit