You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/17 16:24:31 UTC
svn commit: r1104276 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: hwright
Date: Tue May 17 14:24:31 2011
New Revision: 1104276
URL: http://svn.apache.org/viewvc?rev=1104276&view=rev
Log:
More simplification followups to r1104234.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_read_props_streamily): Remove special handling for
depth == files, since the targets list gives us this for free.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1104276&r1=1104275&r2=1104276&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue May 17 14:24:31 2011
@@ -7714,9 +7714,7 @@ svn_wc__db_read_props_streamily(svn_wc__
svn_sqlite__stmt_t *stmt;
cache_props_baton_t baton;
svn_boolean_t have_row;
- int row_number;
apr_pool_t *iterpool;
- svn_boolean_t files_only = (depth == svn_depth_files);
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
SVN_ERR_ASSERT(receiver_func);
@@ -7747,24 +7745,11 @@ svn_wc__db_read_props_streamily(svn_wc__
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_SELECT_RELEVANT_PROPS_FROM_CACHE));
SVN_ERR(svn_sqlite__step(&have_row, stmt));
- for (row_number = 0; have_row; ++row_number)
+ while (have_row)
{
const char *prop_data;
apr_size_t len;
- if (files_only && row_number > 0)
- {
- svn_wc__db_kind_t child_kind;
-
- child_kind = svn_sqlite__column_token(stmt, 1, kind_map);
- if (child_kind != svn_wc__db_kind_file &&
- child_kind != svn_wc__db_kind_symlink)
- {
- SVN_ERR(svn_sqlite__step(&have_row, stmt));
- continue;
- }
- }
-
svn_pool_clear(iterpool);
/* see if someone wants to cancel this operation. */