diff options
author | Tim Potter <tpot@samba.org> | 2006-04-03 09:26:38 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:12 -0500 |
commit | dd8b8dc98ae2450647f3279e744f09d0a5128945 (patch) | |
tree | 969d22810b4b285cca2d92aaf5be0c75590b01e0 /source4/scripting/swig/ldb.i | |
parent | fab7e6605f4e14921b331a8883bf0753ced4b965 (diff) | |
download | samba-dd8b8dc98ae2450647f3279e744f09d0a5128945.tar.gz samba-dd8b8dc98ae2450647f3279e744f09d0a5128945.tar.bz2 samba-dd8b8dc98ae2450647f3279e744f09d0a5128945.zip |
r14881: Unpack ldb_message_element and ldb_val arrays. Python can now access
all parts of a ldb_result:
@BASEINFO has 2 elements
elt[0]: val[0]: sequenceNumber = 2
elt[1]: val[0]: distinguishedName = @BASEINFO
name=foo has 2 elements
elt[0]: val[0]: foo = bar
elt[1]: val[0]: distinguishedName = name=foo
Cleanup some swig junk that was only necessary when including config.h
and function prototypes that used the PRINTF_ATTRIBUTE() macro.
Add some more comments.
(This used to be commit 9327fd07d67da1845a60ccf2b7d1d43e9aed0d68)
Diffstat (limited to 'source4/scripting/swig/ldb.i')
-rw-r--r-- | source4/scripting/swig/ldb.i | 67 |
1 files changed, 41 insertions, 26 deletions
diff --git a/source4/scripting/swig/ldb.i b/source4/scripting/swig/ldb.i index 12053d6ac9..386c414450 100644 --- a/source4/scripting/swig/ldb.i +++ b/source4/scripting/swig/ldb.i @@ -3,7 +3,7 @@ Swig interface to ldb. - Copyright (C) 2005 Tim Potter <tpot@samba.org> + Copyright (C) 2005,2006 Tim Potter <tpot@samba.org> Copyright (C) 2006 Simo Sorce <idra@samba.org> ** NOTE! The following LGPL license applies to the ldb @@ -29,38 +29,28 @@ %{ -/* This symbol is used in both includes.h and Python.h which causes an - annoying compiler warning. */ +/* Some typedefs to help swig along */ -#ifdef HAVE_FSTAT -#undef HAVE_FSTAT -#endif - -#if (__GNUC__ >= 3) -/** Use gcc attribute to check printf fns. a1 is the 1-based index of - * the parameter containing the format, and a2 the index of the first - * argument. Note that some gcc 2.x versions don't handle this - * properly **/ -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) -#else -#define PRINTF_ATTRIBUTE(a1, a2) -#endif - -/* Include ldb headers */ - -/* Treat a uint8_t as an unsigned character */ typedef unsigned char uint8_t; typedef unsigned long long uint64_t; typedef long long int64_t; +/* Include headers */ + #include "lib/ldb/include/ldb.h" #include "lib/talloc/talloc.h" %} -/* The ldb functions will crash if a NULL ldb is passed */ +%include "carrays.i" +%include "exception.i" -%include exception.i +/* + * Wrap struct ldb_context + */ + +/* The ldb functions will crash if a NULL ldb context is passed so + catch this before it happens. */ %typemap(check) struct ldb_context* { if ($1 == NULL) @@ -68,14 +58,19 @@ typedef long long int64_t; "ldb context must be non-NULL"); } +/* + * Wrap TALLOC_CTX + */ + /* Use talloc_init() to create a parameter to pass to ldb_init(). Don't forget to free it using talloc_free() afterwards. */ TALLOC_CTX *talloc_init(char *name); int talloc_free(TALLOC_CTX *ptr); -/* In and out typemaps for struct ldb_val. This is converted to and from - the Python string datatype. */ +/* + * Wrap struct ldb_val + */ %typemap(in) struct ldb_val { if (!PyString_Check($input)) { @@ -99,7 +94,9 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1, LDB_SCOPE_ONELEVEL=1, LDB_SCOPE_SUBTREE=2}; -/* Typemap for passing a struct ldb_result by reference */ +/* + * Wrap struct ldb_result + */ %typemap(in, numinputs=0) struct ldb_result **OUT (struct ldb_result *temp_ldb_result) { $1 = &temp_ldb_result; @@ -119,10 +116,20 @@ enum ldb_scope {LDB_SCOPE_DEFAULT=-1, %types(struct ldb_result *); +/* + * Wrap struct ldb_dn + */ + %typemap(out) struct ldb_dn * { $result = PyString_FromString(ldb_dn_linearize($1, $1)); } +/* + * Wrap struct ldb_message_element + */ + +%array_functions(struct ldb_val, ldb_val_array); + struct ldb_message_element { unsigned int flags; const char *name; @@ -130,6 +137,12 @@ struct ldb_message_element { struct ldb_val *values; }; +/* + * Wrap struct ldb_message + */ + +%array_functions(struct ldb_message_element, ldb_message_element_array); + struct ldb_message { struct ldb_dn *dn; unsigned int num_elements; @@ -137,7 +150,9 @@ struct ldb_message { void *private_data; /* private to the backend */ }; -/* Wrap ldb functions */ +/* + * Wrap ldb functions + */ %rename ldb_init init; struct ldb_context *ldb_init(TALLOC_CTX *mem_ctx); |