summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-24 21:38:33 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-24 21:38:33 +0200
commitf9c36fae757d197ee4de06f0ecf94ae13faad0de (patch)
tree9c93537b32bc7b0748183b894c2a1e600a0eff76 /source4/libcli
parentfe5be25547b5517ebc2e74d298921ae8c53650e5 (diff)
downloadsamba-f9c36fae757d197ee4de06f0ecf94ae13faad0de.tar.gz
samba-f9c36fae757d197ee4de06f0ecf94ae13faad0de.tar.bz2
samba-f9c36fae757d197ee4de06f0ecf94ae13faad0de.zip
Export functions for setting NTSTATUS and WERRORs in python.
(This used to be commit 4bcb92d2d49d90863b1e64b15d055517fbfd263c)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/util/errors.i10
-rw-r--r--source4/libcli/util/pyerrors.h29
2 files changed, 35 insertions, 4 deletions
diff --git a/source4/libcli/util/errors.i b/source4/libcli/util/errors.i
index 17efcbf62a..1fcde04c85 100644
--- a/source4/libcli/util/errors.i
+++ b/source4/libcli/util/errors.i
@@ -18,10 +18,13 @@
*/
#ifdef SWIGPYTHON
+%{
+#include "libcli/util/pyerrors.h"
+%}
+
%typemap(out,noblock=1) WERROR {
if (!W_ERROR_IS_OK($1)) {
- PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V($1), win_errstr($1));
- PyErr_SetObject(PyExc_RuntimeError, obj);
+ PyErr_SetWERROR($1);
SWIG_fail;
} else if ($result == NULL) {
$result = Py_None;
@@ -30,8 +33,7 @@
%typemap(out,noblock=1) NTSTATUS {
if (NT_STATUS_IS_ERR($1)) {
- PyObject *obj = Py_BuildValue((char *)"(i,s)", NT_STATUS_V($1), nt_errstr($1));
- PyErr_SetObject(PyExc_RuntimeError, obj);
+ PyErr_SetNTSTATUS($1);
SWIG_fail;
} else if ($result == NULL) {
$result = Py_None;
diff --git a/source4/libcli/util/pyerrors.h b/source4/libcli/util/pyerrors.h
new file mode 100644
index 0000000000..49d9923130
--- /dev/null
+++ b/source4/libcli/util/pyerrors.h
@@ -0,0 +1,29 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+ Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008
+
+ 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 <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __PYERRORS_H__
+#define __PYERRORS_H__
+
+#define PyErr_SetWERROR(err) \
+ PyErr_SetObject(PyExc_RuntimeError, Py_BuildValue((char *)"(i,s)", W_ERROR_V(err), discard_const_p(char, win_errstr(err))))
+
+#define PyErr_SetNTSTATUS(status) \
+ PyErr_SetObject(PyExc_RuntimeError, Py_BuildValue((char *)"(i,s)", NT_STATUS_V(status), discard_const_p(char, nt_errstr(status))))
+
+#endif /* __PYERRORS_H__ */