1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00

Cleanup of header files for python extensions.

- combine py_foo_proto.h and py_foo.h
 - move #include of Python.h into one place so we can get rid of that
   annoying compiler warning about HAVE_FSTAT being redefined
(This used to be commit 0659351b25)
This commit is contained in:
Tim Potter
2003-02-18 05:05:15 +00:00
parent fb8d1412e1
commit 8f9a17be89
25 changed files with 360 additions and 261 deletions

View File

@ -18,8 +18,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "includes.h"
#include "Python.h"
#include "py_conv.h"
/* Helper for rpcstr_pull() function */
@ -29,6 +27,11 @@ static void fstr_pull(fstring str, UNISTR *uni)
rpcstr_pull(str, uni->buffer, sizeof(fstring), -1, STR_TERMINATE);
}
static void fstr_pull2(fstring str, UNISTR2 *uni)
{
rpcstr_pull(str, uni->buffer, sizeof(fstring), -1, STR_TERMINATE);
}
/* Convert a structure to a Python dict */
PyObject *from_struct(void *s, struct pyconv *conv)
@ -52,6 +55,18 @@ PyObject *from_struct(void *s, struct pyconv *conv)
break;
}
case PY_UNISTR2: {
UNISTR2 *u = (UNISTR2 *)((char *)s + conv[i].offset);
fstring str = "";
if (u->buffer)
fstr_pull2(str, u);
item = PyString_FromString(str);
PyDict_SetItemString(obj, conv[i].name, item);
break;
}
case PY_UINT32: {
uint32 *u = (uint32 *)((char *)s + conv[i].offset);