Author: hwright
Date: Tue Jul 13 13:35:37 2010
New Revision: 963712
URL: http://svn.apache.org/viewvc?rev=963712&view=rev
Log:
Replaces uses of the deprecated svn_io_get_dirents2() and
svn_io_get_dir_filenames() with svn_io_get_dirents3(), appropriately checking
for only the name and type information.
* subversion/mod_dav_svn/repos.c
(deliver),
* subversion/libsvn_wc/adm_ops.c
(erase_from_wc),
* subversion/libsvn_wc/adm_crawler.c
(report_revisions_and_depths),
* subversion/libsvn_wc/upgrade.c
(read_many_wcprops, migrate_text_bases),
* subversion/libsvn_client/commit.c
(import_dir),
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__list_transactions):
Update deprecated calls.
Modified:
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/mod_dav_svn/repos.c
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Tue Jul 13 13:35:37 2010
@@ -309,7 +309,7 @@ import_dir(const svn_delta_editor_t *edi
if (!no_ignore)
SVN_ERR(svn_wc_get_default_ignores(&ignores, ctx->config, pool));
- SVN_ERR(svn_io_get_dirents2(&dirents, path, pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, path, TRUE, pool, pool));
for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi))
{
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jul 13 13:35:37 2010
@@ -7019,7 +7019,7 @@ svn_fs_fs__list_transactions(apr_array_h
txn_dir = svn_dirent_join(fs->path, PATH_TXNS_DIR, pool);
/* Now find a listing of this directory. */
- SVN_ERR(svn_io_get_dirents2(&dirents, txn_dir, pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, txn_dir, TRUE, pool, pool));
/* Loop through all the entries and return anything that ends with '.txn'. */
for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi))
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Jul 13 13:35:37 2010
@@ -241,7 +241,8 @@ report_revisions_and_depths(svn_wc__db_t
dir_abspath = svn_dirent_join(anchor_abspath, dir_path, scratch_pool);
SVN_ERR(svn_wc__db_base_get_children(&base_children, db, dir_abspath,
scratch_pool, iterpool));
- SVN_ERR(svn_io_get_dir_filenames(&dirents, dir_abspath, scratch_pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, dir_abspath, TRUE,
+ scratch_pool, scratch_pool));
/*** Do the real reporting and recursing. ***/
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Jul 13 13:35:37 2010
@@ -755,7 +755,8 @@ erase_from_wc(svn_wc__db_t *db,
}
/* Now handle any remaining unversioned items */
- err = svn_io_get_dirents2(&unversioned, local_abspath, scratch_pool);
+ err = svn_io_get_dirents3(&unversioned, local_abspath, TRUE,
+ scratch_pool, scratch_pool);
if (err)
{
svn_pool_destroy(iterpool);
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Jul 13 13:35:37 2010
@@ -173,7 +173,8 @@ read_many_wcprops(apr_hash_t **all_wcpro
scratch_pool);
/* Now walk the wcprops directory. */
- SVN_ERR(svn_io_get_dirents2(&dirents, props_dir_abspath, scratch_pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, props_dir_abspath, TRUE,
+ scratch_pool, scratch_pool));
for (hi = apr_hash_first(scratch_pool, dirents);
hi;
@@ -1060,7 +1061,8 @@ migrate_text_bases(const char *wcroot_ab
TEXT_BASE_SUBDIR,
scratch_pool);
- SVN_ERR(svn_io_get_dir_filenames(&dirents, text_base_dir, scratch_pool));
+ SVN_ERR(svn_io_get_dirents3(&dirents, text_base_dir, TRUE,
+ scratch_pool, scratch_pool));
for (hi = apr_hash_first(scratch_pool, dirents); hi;
hi = apr_hash_next(hi))
{
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=963712&r1=963711&r2=963712&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Tue Jul 13 13:35:37 2010
@@ -3163,7 +3163,8 @@ deliver(const dav_resource *resource, ap
const char *fs_parent_path =
dav_svn__get_fs_parent_path(resource->info->r);
- serr = svn_io_get_dirents2(&dirents, fs_parent_path, resource->pool);
+ serr = svn_io_get_dirents3(&dirents, fs_parent_path, TRUE,
+ resource->pool, resource->pool);
if (serr != NULL)
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
"couldn't fetch dirents of
SVNParentPath",
