[SCM] Samba Shared Repository - branch master updated - 5c75b65ca15f7c71babd835a45b252fed6534acf

[Jelmer Vernooij]

The branch, master has been updated
       via  5c75b65ca15f7c71babd835a45b252fed6534acf (commit)
       via  86cee0b28c50dd849fe919bbe3faa4deba5275bf (commit)
      from  ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5c75b65ca15f7c71babd835a45b252fed6534acf
Merge: 86cee0b28c50dd849fe919bbe3faa4deba5275bf 
ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Tue Dec 23 22:12:23 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 86cee0b28c50dd849fe919bbe3faa4deba5275bf
Author: Jelmer Vernooij <jel...@samba.org>
Date:   Tue Dec 23 04:06:21 2008 +0100

    pytalloc: Add some comments, use talloc object location in repr rather
    than python object location.

-----------------------------------------------------------------------

Summary of changes:
 lib/talloc/pytalloc.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 8bc85ee..51d087b 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -18,8 +18,11 @@
 */
 
 #include <talloc.h>
-#include "../lib/talloc/pytalloc.h"
+#include <pytalloc.h>
 
+/**
+ * Simple dealloc for talloc-wrapping PyObjects
+ */
 void py_talloc_dealloc(PyObject* self)
 {
        py_talloc_Object *obj = (py_talloc_Object *)self;
@@ -28,6 +31,9 @@ void py_talloc_dealloc(PyObject* self)
        self->ob_type->tp_free(self);
 }
 
+/**
+ * Import an existing talloc pointer into a Python object.
+ */
 PyObject *py_talloc_import_ex(PyTypeObject *py_type, TALLOC_CTX *mem_ctx, 
                                                   void *ptr)
 {
@@ -43,10 +49,14 @@ PyObject *py_talloc_import_ex(PyTypeObject *py_type, 
TALLOC_CTX *mem_ctx,
        return (PyObject *)ret;
 }
 
-PyObject *py_talloc_default_repr(PyObject *py_obj)
+/**
+ * Default (but slightly more useful than the default) implementation of 
Repr().
+ */
+PyObject *py_talloc_default_repr(PyObject *obj)
 {
-       py_talloc_Object *obj = (py_talloc_Object *)py_obj;
-       PyTypeObject *type = (PyTypeObject*)PyObject_Type((PyObject *)obj);
+       py_talloc_Object *talloc_obj = (py_talloc_Object *)obj;
+       PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj);
 
-       return PyString_FromFormat("<%s talloc object at 0x%x>", type->tp_name, 
(intptr_t)py_obj);
+       return PyString_FromFormat("<%s talloc object at 0x%x>", 
+                                  type->tp_name, (intptr_t)talloc_obj->ptr);
 }


-- 
Samba Shared Repository