svn commit: r1091272 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[hw...@apache.org]

Author: hwright
Date: Tue Apr 12 01:04:13 2011
New Revision: 1091272

URL: http://svn.apache.org/viewvc?rev=1091272&view=rev
Log:
Simplify the way we retrieve the kind of a node from the DB.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_set_changelist2): We only need the kind, so use the purpose-build
    API to fetch that information.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1091272&r1=1091271&r2=1091272&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Apr 12 01:04:13 2011
@@ -2115,7 +2115,6 @@ svn_wc_set_changelist2(svn_wc_context_t 
                        void *notify_baton,
                        apr_pool_t *scratch_pool)
 {
-  const char *existing_changelist;
   svn_wc__db_kind_t kind;
 
   /* Assert that we aren't being asked to set an empty changelist. */
@@ -2123,12 +2122,7 @@ svn_wc_set_changelist2(svn_wc_context_t 
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
 
-  SVN_ERR(svn_wc__db_read_info(NULL, &kind, NULL, NULL, NULL, NULL, NULL,
-                               NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                               &existing_changelist,
-                               NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                               NULL, NULL,
-                               wc_ctx->db, local_abspath, scratch_pool,
+  SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, TRUE,
                                scratch_pool));
 
   /* We can't add directories to changelists. */