diff options
| author | Jelmer Vernooij <jelmer@jelmer.uk> | 2016-07-09 22:38:21 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@jelmer.uk> | 2016-07-09 22:38:21 +0000 |
| commit | 363fd478c7065ecd641b6c752026cc30773c2c81 (patch) | |
| tree | 96c54d58ff26284b3845a1425d7b8939ed8d140c /subvertpy | |
| parent | f9830c76fadbcbc05e7d173b1f4a0996115f2954 (diff) | |
Avoid svn_path_join.
Diffstat (limited to 'subvertpy')
| -rw-r--r-- | subvertpy/_ra.c | 2 | ||||
| -rw-r--r-- | subvertpy/util.c | 1 | ||||
| -rw-r--r-- | subvertpy/wc.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/subvertpy/_ra.c b/subvertpy/_ra.c index 899a391a..4b8453c4 100644 --- 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 d701e119..e4ed2cd7 100644 --- 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 e7a736a8..60126095 100644 --- 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)); |