From b8dc3c8a83af38adf0ee5874331b04692f2dec8d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 1 Dec 2010 00:14:27 +0100
Subject: pytalloc: Make py_talloc_dealloc private.

---
 lib/talloc/pytalloc.c      | 11 +++++++++++
 lib/talloc/pytalloc.h      |  3 ---
 lib/talloc/pytalloc_util.c | 11 -----------
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index b1f2afb8d5..c45810f44d 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -86,6 +86,17 @@ static PyObject *py_talloc_default_repr(PyObject *obj)
 				   type->tp_name, talloc_obj->ptr);
 }
 
+/**
+ * Simple dealloc for talloc-wrapping PyObjects
+ */
+static void py_talloc_dealloc(PyObject* self)
+{
+	py_talloc_Object *obj = (py_talloc_Object *)self;
+	assert(talloc_unlink(NULL, obj->talloc_ctx) != -1);
+	obj->talloc_ctx = NULL;
+	self->ob_type->tp_free(self);
+}
+
 static PyTypeObject TallocObject_Type = {
 	.tp_name = "talloc.Object",
 	.tp_basicsize = sizeof(py_talloc_Object),
diff --git a/lib/talloc/pytalloc.h b/lib/talloc/pytalloc.h
index 1561576d34..affb77ce9a 100644
--- a/lib/talloc/pytalloc.h
+++ b/lib/talloc/pytalloc.h
@@ -29,9 +29,6 @@ typedef struct {
 	void *ptr;
 } py_talloc_Object;
 
-/* Deallocate a py_talloc_Object */
-void py_talloc_dealloc(PyObject* self);
-
 PyTypeObject *PyTalloc_GetObjectType(void);
 int PyTalloc_Check(PyObject *);
 
diff --git a/lib/talloc/pytalloc_util.c b/lib/talloc/pytalloc_util.c
index d285f01531..4ed2f16b24 100644
--- a/lib/talloc/pytalloc_util.c
+++ b/lib/talloc/pytalloc_util.c
@@ -43,17 +43,6 @@ PyTypeObject *PyTalloc_GetObjectType(void)
 	return type;
 }
 
-/**
- * Simple dealloc for talloc-wrapping PyObjects
- */
-void py_talloc_dealloc(PyObject* self)
-{
-	py_talloc_Object *obj = (py_talloc_Object *)self;
-	assert(talloc_unlink(NULL, obj->talloc_ctx) != -1);
-	obj->talloc_ctx = NULL;
-	self->ob_type->tp_free(self);
-}
-
 /**
  * Import an existing talloc pointer into a Python object.
  */
-- 
cgit