Avoid svn_path_join.

diff --git a/subvertpy/_ra.c b/subvertpy/_ra.c
index 899a391af55ebab768f9b6862643b3fff65890a1..4b8453c4046294e596e6a819576d9c484c1c0aed 100644 (file)
--- a/subvertpy/_ra.c
+++ b/subvertpy/_ra.c
@@ -503,7 +503,7 @@ static svn_error_t *py_open_tmp_file(apr_file_t **fp, void *callback,
                const char *path;
 
                SVN_ERR (svn_io_temp_dir (&path, pool));
-               path = svn_path_join (path, "subvertpy", pool);
+               path = svn_dirent_join (path, "subvertpy", pool);
 #if ONLY_SINCE_SVN(1, 6)
                SVN_ERR (svn_io_open_unique_file3(fp, NULL, path, svn_io_file_del_on_pool_cleanup, pool, pool));
 #else

diff --git a/subvertpy/util.c b/subvertpy/util.c
index d701e119b1513a3a1cfd1b13bb2e894ddb4edf2b..e4ed2cd7bcd8618d13e613c3443b4571dc7df0f3 100644 (file)
--- a/subvertpy/util.c
+++ b/subvertpy/util.c
@@ -119,7 +119,6 @@ char *py_object_to_svn_uri(PyObject *obj, apr_pool_t *pool)
 char *py_object_to_svn_relpath(PyObject *obj, apr_pool_t *pool)
 {
        PyObject *bytes_obj = NULL;
-       char *ret;
 
        if (PyUnicode_Check(obj)) {
                bytes_obj = obj = PyUnicode_AsUTF8String(obj);

diff --git a/subvertpy/wc.c b/subvertpy/wc.c
index e7a736a848a17fabe58d9d443f54bd03d583b59b..6012609519b43043e9ebf733197973a89409d296 100644 (file)
--- a/subvertpy/wc.c
+++ b/subvertpy/wc.c
@@ -2028,7 +2028,7 @@ static PyObject *ra_status(PyObject *self, PyObject *args)
        RUN_SVN_WITH_POOL(temp_pool, 
                        svn_wc_status2(
                                &st,
-                               svn_dirent_canonicalize(svn_path_join(svn_wc_adm_access_path(admobj->adm), path, temp_pool), temp_pool),
+                               svn_dirent_canonicalize(svn_dirent_join(svn_wc_adm_access_path(admobj->adm), path, temp_pool), temp_pool),
                                admobj->adm,
                                temp_pool));