svn commit: r1076658 - /subversion/trunk/subversion/libsvn_client/prop_commands.c

[ph...@apache.org]

Author: philip
Date: Thu Mar  3 15:51:13 2011
New Revision: 1076658

URL: http://svn.apache.org/viewvc?rev=1076658&view=rev
Log:
* subversion/libsvn_client/prop_commands.c
  (struct proplist_walk_baton, proplist_walk_cb): Remove redundant code.

Modified:
    subversion/trunk/subversion/libsvn_client/prop_commands.c

Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1076658&r1=1076657&r2=1076658&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Thu Mar  3 15:51:13 2011
@@ -1160,63 +1160,6 @@ remote_proplist(const char *target_prefi
 }
 
 
-/* A baton for proplist_walk_cb. */
-struct proplist_walk_baton
-{
-  svn_boolean_t pristine;  /* Select base rather than working props. */
-  apr_hash_t *changelist_hash; /* Keys are changelists to filter on. */
-  svn_wc_context_t *wc_ctx;  /* Context for the tree being walked. */
-  svn_proplist_receiver_t receiver;  /* Proplist receiver to call. */
-  void *receiver_baton;    /* Baton for the proplist receiver. */
-
-  /* Anchor, anchor_abspath pair for converting to relative paths */
-  const char *anchor;
-  const char *anchor_abspath;
-};
-
-/* An entries-walk callback for svn_client_proplist.
- *
- * For the path given by LOCAL_ABSPATH, populate wb->PROPS with a
- * svn_client_proplist_item_t for each path, where "wb" is the WALK_BATON of
- * type "struct proplist_walk_baton *".  If wb->PRISTINE is true, use the base
- * values, else use the working values.
- */
-static svn_error_t *
-proplist_walk_cb(const char *local_abspath,
-                 svn_node_kind_t kind,
-                 void *walk_baton,
-                 apr_pool_t *scratch_pool)
-{
-  struct proplist_walk_baton *wb = walk_baton;
-  apr_hash_t *props;
-  const char *path;
-
-  /* If our entry doesn't pass changelist filtering, get outta here. */
-  if (! svn_wc__changelist_match(wb->wc_ctx, local_abspath,
-                                 wb->changelist_hash, scratch_pool))
-    return SVN_NO_ERROR;
-
-  SVN_ERR(pristine_or_working_props(&props, wb->wc_ctx, local_abspath,
-                                    wb->pristine, scratch_pool, scratch_pool));
-
-  /* Bail if this node is defined to have no properties.  */
-  if (props == NULL)
-    return SVN_NO_ERROR;
-
-  if (wb->anchor && wb->anchor_abspath)
-    {
-      path = svn_dirent_join(wb->anchor,
-                             svn_dirent_skip_ancestor(wb->anchor_abspath,
-                                                      local_abspath),
-                             scratch_pool);
-    }
-  else
-    path = local_abspath;
-
-  return call_receiver(path, props, wb->receiver, wb->receiver_baton,
-                       scratch_pool);
-}
-
 /* Baton for recursive_proplist_receiver(). */
 struct recursive_proplist_receiver_baton
 {