summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 02:52:51 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 02:52:51 +0200
commit0f043c197c473c801fc32c727194b5a2d6ae232f (patch)
treeb270f5c7303589226e1a513eefbf82b3f6eb8c50 /source4
parent7ec58471dfd12cbd3aa38a07145b1ecceaec1933 (diff)
downloadsamba-0f043c197c473c801fc32c727194b5a2d6ae232f.tar.gz
samba-0f043c197c473c801fc32c727194b5a2d6ae232f.tar.bz2
samba-0f043c197c473c801fc32c727194b5a2d6ae232f.zip
Move pytalloc to talloc directory.
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/config.mk2
-rw-r--r--source4/scripting/python/pytalloc.c52
-rw-r--r--source4/scripting/python/pytalloc.h51
3 files changed, 1 insertions, 104 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c88728a9fd..5a44fd5ae6 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -8,7 +8,7 @@ LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
[SUBSYSTEM::PYTALLOC]
PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC
-PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o)
+PYTALLOC_OBJ_FILES = ../lib/talloc/pytalloc.o
[PYTHON::python_uuid]
PRIVATE_DEPENDENCIES = LIBNDR
diff --git a/source4/scripting/python/pytalloc.c b/source4/scripting/python/pytalloc.c
deleted file mode 100644
index ca476e9604..0000000000
--- a/source4/scripting/python/pytalloc.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Python/Talloc glue
- 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/>.
-*/
-
-#include "includes.h"
-#include "scripting/python/pytalloc.h"
-
-void py_talloc_dealloc(PyObject* self)
-{
- py_talloc_Object *obj = (py_talloc_Object *)self;
- talloc_free(obj->talloc_ctx);
- obj->talloc_ctx = NULL;
- PyObject_Del(self);
-}
-
-PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx,
- void *ptr)
-{
- py_talloc_Object *ret = PyObject_New(py_talloc_Object, py_type);
- ret->talloc_ctx = talloc_new(NULL);
- if (ret->talloc_ctx == NULL) {
- return NULL;
- }
- if (talloc_reference(ret->talloc_ctx, mem_ctx) == NULL) {
- return NULL;
- }
- ret->ptr = ptr;
- return (PyObject *)ret;
-}
-
-PyObject *py_talloc_default_repr(PyObject *py_obj)
-{
- py_talloc_Object *obj = (py_talloc_Object *)py_obj;
- PyTypeObject *type = (PyTypeObject*)PyObject_Type((PyObject *)obj);
-
- return PyString_FromFormat("<%s talloc object at 0x%x>", type->tp_name, (intptr_t)py_obj);
-}
diff --git a/source4/scripting/python/pytalloc.h b/source4/scripting/python/pytalloc.h
deleted file mode 100644
index aad5840a67..0000000000
--- a/source4/scripting/python/pytalloc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- 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 _PY_TALLOC_H_
-#define _PY_TALLOC_H_
-
-#include <Python.h>
-
-typedef struct {
- PyObject_HEAD
- TALLOC_CTX *talloc_ctx;
- void *ptr;
-} py_talloc_Object;
-
-/* Deallocate a py_talloc_Object */
-void py_talloc_dealloc(PyObject* self);
-
-/* Retrieve the pointer for a py_talloc_object. Like talloc_get_type()
- * but for py_talloc_Objects. */
-
-/* FIXME: Call PyErr_SetString(PyExc_TypeError, "expected " __STR(type) ")
- * when talloc_get_type() returns NULL. */
-#define py_talloc_get_type(py_obj, type) \
- talloc_get_type(py_talloc_get_ptr(py_obj), type)
-
-#define py_talloc_get_ptr(py_obj) ((py_talloc_Object *)py_obj)->ptr
-#define py_talloc_get_mem_ctx(py_obj) ((py_talloc_Object *)py_obj)->talloc_ctx
-
-PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, void *ptr);
-#define py_talloc_import(py_type, talloc_ptr) py_talloc_import_ex(py_type, talloc_ptr, talloc_ptr)
-
-/* Sane default implementation of reprfunc. */
-PyObject *py_talloc_default_repr(PyObject *py_obj);
-
-#endif /* _PY_TALLOC_H_ */