diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
| commit | cf46733632c7279a9fd0fe6ce26f9185a4ae82a9 (patch) | |
| tree | da27775a2161723ef342e91af41a8b51fedef405 /subversion/libsvn_wc/adm_files.c | |
| parent | bb0ef45f7c46b0ae221b26265ef98a768c33f820 (diff) | |
| download | subversion-tarball-master.tar.gz | |
subversion-1.9.7HEADsubversion-1.9.7master
Diffstat (limited to 'subversion/libsvn_wc/adm_files.c')
| -rw-r--r-- | subversion/libsvn_wc/adm_files.c | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/subversion/libsvn_wc/adm_files.c b/subversion/libsvn_wc/adm_files.c index 11ad277..67a1357 100644 --- a/subversion/libsvn_wc/adm_files.c +++ b/subversion/libsvn_wc/adm_files.c @@ -117,7 +117,7 @@ svn_wc__adm_child(const char *path, path, adm_dir_name, child, - NULL); + SVN_VA_NULL); } @@ -295,38 +295,6 @@ svn_wc__open_adm_stream(svn_stream_t **stream, } -svn_error_t * -svn_wc__open_writable_base(svn_stream_t **stream, - const char **temp_base_abspath, - svn_checksum_t **md5_checksum, - svn_checksum_t **sha1_checksum, - svn_wc__db_t *db, - const char *wri_abspath, - apr_pool_t *result_pool, - apr_pool_t *scratch_pool) -{ - const char *temp_dir_abspath; - SVN_ERR_ASSERT(svn_dirent_is_absolute(wri_abspath)); - - SVN_ERR(svn_wc__db_pristine_get_tempdir(&temp_dir_abspath, db, wri_abspath, - scratch_pool, scratch_pool)); - SVN_ERR(svn_stream_open_unique(stream, - temp_base_abspath, - temp_dir_abspath, - svn_io_file_del_none, - result_pool, scratch_pool)); - if (md5_checksum) - *stream = svn_stream_checksummed2(*stream, NULL, md5_checksum, - svn_checksum_md5, FALSE, result_pool); - if (sha1_checksum) - *stream = svn_stream_checksummed2(*stream, NULL, sha1_checksum, - svn_checksum_sha1, FALSE, result_pool); - - return SVN_NO_ERROR; -} - - - /*** Checking for and creating administrative subdirs. ***/ @@ -464,11 +432,14 @@ svn_wc__internal_ensure_adm(svn_wc__db_t *db, db, local_abspath, scratch_pool, scratch_pool)); else - SVN_ERR(svn_wc__db_scan_base_repos(&db_repos_relpath, - &db_repos_root_url, - &db_repos_uuid, - db, local_abspath, - scratch_pool, scratch_pool)); + SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, + &db_repos_relpath, + &db_repos_root_url, + &db_repos_uuid, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, + NULL, NULL, + db, local_abspath, + scratch_pool, scratch_pool)); } /* The caller gives us a URL which should match the entry. However, |