Rev 1080: Remove return type from done handlers. in file:///data/jelmer/bzr-svn/cext/

Jelmer Vernooij jelmer at samba.org
Thu Jun 5 11:37:25 BST 2008


At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1080
revision-id: jelmer at samba.org-20080605103724-l1w6ju7lagqmp4e9
parent: jelmer at samba.org-20080605102308-pfwpg12ncghl7jnp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 12:37:24 +0200
message:
  Remove return type from done handlers.
modified:
  editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
  editor.h                       editor.h-20080602191336-frj7az1sdk13o1tw-2
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
=== modified file 'editor.c'
--- a/editor.c	2008-06-04 23:03:52 +0000
+++ b/editor.c	2008-06-05 10:37:24 +0000
@@ -29,11 +29,11 @@
     const svn_delta_editor_t *editor;
     void *baton;
     apr_pool_t *pool;
-	PyObject *(*done_cb) (void *baton);
+	void (*done_cb) (void *baton);
 	void *done_baton;
 } EditorObject;
 
-PyObject *new_editor_object(const svn_delta_editor_t *editor, void *baton, apr_pool_t *pool, PyTypeObject *type, PyObject *(*done_cb) (void *), void *done_baton)
+PyObject *new_editor_object(const svn_delta_editor_t *editor, void *baton, apr_pool_t *pool, PyTypeObject *type, void (*done_cb) (void *), void *done_baton)
 {
 	EditorObject *obj = PyObject_New(EditorObject, type);
 	if (obj == NULL)

=== modified file 'editor.h'
--- a/editor.h	2008-06-04 22:09:09 +0000
+++ b/editor.h	2008-06-05 10:37:24 +0000
@@ -26,7 +26,7 @@
 PyAPI_DATA(PyTypeObject) FileEditor_Type;
 PyAPI_DATA(PyTypeObject) Editor_Type;
 PyAPI_DATA(PyTypeObject) TxDeltaWindowHandler_Type;
-PyObject *new_editor_object(const svn_delta_editor_t *editor, void *baton, apr_pool_t *pool, PyTypeObject *type, PyObject *(*done_cb) (void *baton), void *done_baton);
+PyObject *new_editor_object(const svn_delta_editor_t *editor, void *baton, apr_pool_t *pool, PyTypeObject *type, void (*done_cb) (void *baton), void *done_baton);
 
 #define DirectoryEditor_Check(op) PyObject_TypeCheck(op, &DirectoryEditor_Type)
 #define FileEditor_Check(op) PyObject_TypeCheck(op, &FileEditor_Type)

=== modified file 'ra.c'
--- a/ra.c	2008-06-04 23:03:52 +0000
+++ b/ra.c	2008-06-05 10:37:24 +0000
@@ -97,7 +97,7 @@
     const svn_ra_reporter2_t *reporter;
     void *report_baton;
     apr_pool_t *pool;
-	PyObject *(*done_cb)(void *baton);
+	void (*done_cb)(void *baton);
 	void *done_baton;
 } ReporterObject;
 
@@ -478,13 +478,11 @@
 	bool busy;
 } RemoteAccessObject;
 
-static PyObject *ra_done_handler(void *_ra)
+static void ra_done_handler(void *_ra)
 {
 	RemoteAccessObject *ra = (RemoteAccessObject *)_ra;
 
 	ra->busy = false;
-
-	Py_RETURN_NONE;
 }
 
 #define RUN_RA_WITH_POOL(pool, ra, cmd)  \




More information about the bazaar-commits mailing list