sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r2424: Refactor handling of non-OK NTSTATUS returns to be more swiggish.

Browse Source
This commit is contained in:
Tim Potter 2004-09-20 00:55:53 +00:00 committed by Gerald (Jerry) Carter
parent 7a7cf9f352
commit aaef6eaf6e
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/build/pidl/swig.pm
View File

@ -241,7 +241,7 @@ sub ParseFunction($)
$result .= "\tif (!PyDict_Check(obj)) {\n";
$result .= "\t\tPyErr_Format(PyExc_TypeError, \"Expecting dict value for key '%s'\", name);\n";
$result .= "\t\treturn NULL;\n";
$result .= "\t\t\treturn NULL;\n";
$result .= "\t}\n\n";
$result .= "\ts = talloc(mem_ctx, sizeof(struct $fn->{NAME}));\n\n";
@ -282,8 +282,7 @@ sub ParseFunction($)
$result .= "\tTALLOC_CTX *mem_ctx = talloc_init(\"typemap(int) $fn->{NAME}\");\n\n";
$result .= "\t\$1 = $fn->{NAME}_ptr_from_python(mem_ctx, \$input, \"<function params>\");\n\n";
$result .= "\tif (PyErr_Occurred())\n";
$result .= "\t\t\treturn NULL;\n\n";
$result .= "\tif (PyErr_Occurred()) return NULL;\n\n";
$result .= "}\n\n";
@ -291,18 +290,8 @@ sub ParseFunction($)
$result .= "%typemap(argout) struct $fn->{NAME} * {\n";
$result .= "\tTALLOC_CTX *mem_ctx = talloc_init(\"typemap(argout) $fn->{NAME}\");\n\n";
$result .= "\tlong status = PyLong_AsLong(resultobj);\n";
$result .= "\tPyObject *dict;\n";
$result .= "\n";
$result .= "\tif (status != 0) {\n";
$result .= "\t\tset_ntstatus_exception(status);\n";
$result .= "\t\treturn NULL;\n";
$result .= "\t}\n";
$result .= "\n";
$result .= "\tdict = $fn->{NAME}_ptr_to_python(mem_ctx, \$1);\n";
$result .= "\tresultobj = dict;\n";
$result .= "\tresultobj = $fn->{NAME}_ptr_to_python(mem_ctx, \$1);\n\n";
$result .= "\ttalloc_free(mem_ctx);\n";
$result .= "}\n\n";
# Function definitions
@ -337,8 +326,7 @@ sub ParseStruct($)
$result .= "\t\treturn NULL;\n";
$result .= "\t}\n\n";
$result .= "\tif (obj == Py_None) {\n";
$result .= "\t\treturn NULL;\n";
$result .= "\tif (obj == Py_None) return NULL;\n";
$result .= "\t}\n\n";
$result .= "\tif (!PyDict_Check(obj)) {\n";
@ -575,8 +563,7 @@ sub Parse($)
# Generate interface
$result = "/* Auto-generated by pidl */\n\n";
$result = "/* Tastes like -*- C -*- */\n\n";
$result .= "/* Auto-generated by pidl. Tastes like -*- C -*-. */\n\n";
foreach my $x (@{$idl}) {
$result .= ParseHeader($x) if ($x->{TYPE} eq "INTERFACE");

10
source/scripting/swig/dcerpc.i
View File

@ -285,6 +285,16 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
const char *username,
const char *password);
/* Run this test after each wrapped function */
%exception {
$action
if (!NT_STATUS_IS_OK(result)) {
set_ntstatus_exception(NT_STATUS_V(result));
return NULL;
}
}
%include "librpc/gen_ndr/misc.i"
%include "librpc/gen_ndr/lsa.i"
%include "librpc/gen_ndr/samr.i"