danchr / subvertpy / changeset / f67406ad6c4c

@@ -673,18 +673,8 @@ static svn_error_t *py_open_tmp_file(apr
+		}
 		Py_DECREF(ret);
 	} else if (PyFile_Check(ret)) {
 		FILE *file;
 		apr_os_file_t osfile;
 		file = PyFile_AsFile(ret);
 #ifdef WIN32
 		osfile = (apr_os_file_t)_get_osfhandle(_fileno(file));
 #else
 		osfile = (apr_os_file_t)fileno(file);
 #endif
 		status = apr_os_file_put(fp, &osfile, O_CREAT | O_WRONLY, pool);
 		if (status) {
 			PyErr_SetAprStatus(status);
 		*fp = apr_file_from_object(ret, pool);
 		if (!*fp) {
 			Py_DECREF(ret);
 			PyGILState_Release(state);
 			return py_svn_error();

 #include <stdbool.h>
 #include <Python.h>
 #include <apr_general.h>
 #include <apr_file_io.h>
 #include <apr_portable.h>
 #include <svn_error.h>
 #include <svn_io.h>
 #include <apr_errno.h>
@@ -554,3 +556,26 @@ PyObject *py_dirent(svn_dirent_t *dirent
 	return ret;
+}
 apr_file_t *apr_file_from_object(PyObject *object, apr_pool_t *pool)
+{
     apr_status_t status;
     FILE *file;
     apr_file_t *fp;
     apr_os_file_t osfile;
     file = PyFile_AsFile(object);
 #ifdef WIN32
     osfile = (apr_os_file_t)_get_osfhandle(_fileno(file));
 #else
     osfile = (apr_os_file_t)fileno(file);
 #endif
     status = apr_os_file_put(&fp, &osfile,
                              APR_FOPEN_WRITE | APR_FOPEN_CREATE, pool);
     if (status) {
         PyErr_SetAprStatus(status);
         return NULL;
+    }
     return fp;
+}

@@ -71,6 +71,7 @@ svn_error_t *py_cancel_func(void *cancel
 apr_hash_t *config_hash_from_object(PyObject *config, apr_pool_t *pool);
 void PyErr_SetAprStatus(apr_status_t status);
 PyObject *py_dirent(svn_dirent_t *dirent, int dirent_fields);
 apr_file_t *apr_file_from_object(PyObject *object, apr_pool_t *pool);
 #if SVN_VER_MAJOR == 1 && SVN_VER_MINOR >= 5
 svn_error_t *py_svn_log_entry_receiver(void *baton, svn_log_entry_t *log_entry, apr_pool_t *pool);