subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1602359 - in /subversion/trunk/subversion/libsvn_fs_x: hotcopy.c index.c transaction.c tree.c
Date Fri, 13 Jun 2014 10:16:14 GMT
Author: philip
Date: Fri Jun 13 10:16:14 2014
New Revision: 1602359

URL: http://svn.apache.org/r1602359
Log:
Remove some unused FSX code.

* subversion/libsvn_fs_x/tree.c
  (is_changed_node): Remove.

* subversion/libsvn_fs_x/hotcopy.c
  (hotcopy_body, hotcopy_locking_src_body): Remove unused variable.

* subversion/libsvn_fs_x/index.c
  (p2l_entries_func): Remove unused variable.

* subversion/libsvn_fs_x/transaction.c
  (svn_fs_x__with_all_locks,
   rep_write_contents_close,
   write_final_changed_path_info): Remove unused variable.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
    subversion/trunk/subversion/libsvn_fs_x/index.c
    subversion/trunk/subversion/libsvn_fs_x/transaction.c
    subversion/trunk/subversion/libsvn_fs_x/tree.c

Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.c?rev=1602359&r1=1602358&r2=1602359&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.c Fri Jun 13 10:16:14 2014
@@ -586,7 +586,6 @@ hotcopy_body(void *baton, apr_pool_t *po
   svn_fs_t *src_fs = hbb->src_fs;
   fs_x_data_t *src_ffd = src_fs->fsap_data;
   svn_fs_t *dst_fs = hbb->dst_fs;
-  fs_x_data_t *dst_ffd = dst_fs->fsap_data;
   int max_files_per_dir = src_ffd->max_files_per_dir;
   svn_boolean_t incremental = hbb->incremental;
   svn_cancel_func_t cancel_func = hbb->cancel_func;
@@ -908,7 +907,6 @@ static svn_error_t *
 hotcopy_locking_src_body(void *baton, apr_pool_t *pool)
 {
   struct hotcopy_body_baton *hbb = baton;
-  fs_x_data_t *src_ffd = hbb->src_fs->fsap_data;
 
   return svn_error_trace(svn_fs_x__with_pack_lock(hbb->src_fs, hotcopy_body,
                                                   baton, pool));

Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1602359&r1=1602358&r2=1602359&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Fri Jun 13 10:16:14 2014
@@ -2548,7 +2548,6 @@ p2l_entries_func(void **out,
   apr_array_header_t *entries = *(apr_array_header_t **)out;
   const apr_array_header_t *raw_page = data;
   p2l_entries_baton_t *block = baton;
-  int i;
 
   /* Make PAGE a readable APR array. */
   apr_array_header_t page = *raw_page;

Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1602359&r1=1602358&r2=1602359&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jun 13 10:16:14 2014
@@ -479,8 +479,6 @@ svn_fs_x__with_all_locks(svn_fs_t *fs,
                          void *baton,
                          apr_pool_t *pool)
 {
-  fs_x_data_t *ffd = fs->fsap_data;
-
   /* Be sure to use the correct lock ordering as documented in
      fs_fs_shared_data_t.  The lock chain is being created in 
      innermost (last to acquire) -> outermost (first to acquire) order. */
@@ -2362,7 +2360,6 @@ rep_write_contents_close(void *baton)
     {
       svn_fs_x__p2l_entry_t entry;
       svn_fs_x__id_part_t noderev_id;
-      svn_checksum_t *checksum;
       noderev_id.change_set = SVN_FS_X__INVALID_CHANGE_SET;
       noderev_id.number = rep->id.number;
 
@@ -3001,7 +2998,6 @@ write_final_changed_path_info(apr_off_t 
 {
   apr_off_t offset;
   svn_stream_t *stream;
-  apr_hash_index_t *hi;
   svn_fs_x__p2l_entry_t entry;
   svn_fs_x__id_part_t rev_item
     = {SVN_INVALID_REVNUM, SVN_FS_X__ITEM_INDEX_CHANGES};

Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1602359&r1=1602358&r2=1602359&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jun 13 10:16:14 2014
@@ -2463,65 +2463,6 @@ typedef enum copy_type_t
   copy_type_add_with_history,
 } copy_type_t;
 
-/* Set CHANGES to TRUE if PATH in ROOT is unchanged in REVISION if the
-   same files system.  If the content is identical, parent path copies and
-   deletions still count as changes.  Use POOL for temporary allocations.
-   Not that we will return an error if PATH does not exist in ROOT or
-   REVISION- */
-static svn_error_t *
-is_changed_node(svn_boolean_t *changed,
-                svn_fs_root_t *root,
-                const char *path,
-                svn_revnum_t revision,
-                apr_pool_t *pool)
-{
-  dag_node_t *node, *rev_node;
-  svn_fs_root_t *rev_root;
-  svn_fs_root_t *copy_from_root1, *copy_from_root2;
-  const char *copy_from_path1, *copy_from_path2;
-
-  SVN_ERR(svn_fs_x__revision_root(&rev_root, root->fs, revision, pool));
-
-  /* Get the NODE for FROM_PATH in FROM_ROOT.*/
-  SVN_ERR(get_dag(&node, root, path, TRUE, pool));
-  SVN_ERR(get_dag(&rev_node, rev_root, path, TRUE, pool));
-
-  /* different ID -> got changed */
-  if (!svn_fs_x__id_eq(svn_fs_x__dag_get_id(node),
-                       svn_fs_x__dag_get_id(rev_node)))
-    {
-      *changed = TRUE;
-       return SVN_NO_ERROR;
-    }
-
-  /* same node. might still be a lazy copy with separate history */
-  SVN_ERR(x_closest_copy(&copy_from_root1, &copy_from_path1, root,
-                         path, pool));
-  SVN_ERR(x_closest_copy(&copy_from_root2, &copy_from_path2, rev_root,
-                         path, pool));
-
-  if (copy_from_root1 == NULL && copy_from_root2 == NULL)
-    {
-      /* never copied -> same line of history */
-      *changed = FALSE;
-    }
-  else if (copy_from_root1 != NULL && copy_from_root2 != NULL)
-    {
-      /* both got copied. At the same time & location? */
-      *changed = (copy_from_root1->rev != copy_from_root2->rev)
-                 || strcmp(copy_from_path1, copy_from_path2);
-    }
-  else
-    {
-      /* one is a copy while the other one is not
-       * -> different lines of history */
-      *changed = TRUE;
-    }
-
-  return SVN_NO_ERROR;
-}
-
-
 /* Copy the node at FROM_PATH under FROM_ROOT to TO_PATH under
    TO_ROOT.  COPY_TYPE determines whether then the copy is recorded in
    the copies table and whether it is being marked as a move.



Mime
View raw message