Merge branch 'sg/cocci-move-array'

Code clean-up.

* sg/cocci-move-array:
Use MOVE_ARRAY

diff --combined cache-tree.c
index 0dd6292a94e55baff0a42df89c7006a757f61065,18946aa458da3596e7aed3d5ce0af32e0458fccb..3841cef0c064b19722cb60742ed3bd95b9cde520
--- 1/cache-tree.c
--- 2/cache-tree.c
+++ b/cache-tree.c
@@@ -84,9 -84,8 +84,8 @@@ static struct cache_tree_sub *find_subt
        down->namelen = pathlen;
  
        if (pos < it->subtree_nr)
-               memmove(it->down + pos + 1,
-                       it->down + pos,
-                       sizeof(down) * (it->subtree_nr - pos - 1));
+               MOVE_ARRAY(it->down + pos + 1, it->down + pos,
+                          it->subtree_nr - pos - 1);
        it->down[pos] = down;
        return down;
  }
@@@ -608,7 -607,7 +607,7 @@@ int write_index_as_tree(unsigned char *
  
        hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
  
 -      entries = read_index_from(index_state, index_path);
 +      entries = read_index_from(index_state, index_path, get_git_dir());
        if (entries < 0) {
                ret = WRITE_TREE_UNREADABLE_INDEX;
                goto out;

diff --combined commit.c
index ff51c9f34a975fdd3320f8c185f6e3c8b5176e81,7d0080180d9f0dc41c0ebbe4ed87a67a98659931..c948c8b0e46a4b13d1e3045944ca1cea05d75517
--- 1/commit.c
--- 2/commit.c
+++ b/commit.c
@@@ -126,10 -126,8 +126,8 @@@ int register_commit_graft(struct commit
        ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
        commit_graft_nr++;
        if (pos < commit_graft_nr)
-               memmove(commit_graft + pos + 1,
-                       commit_graft + pos,
-                       (commit_graft_nr - pos - 1) *
-                       sizeof(*commit_graft));
+               MOVE_ARRAY(commit_graft + pos + 1, commit_graft + pos,
+                          commit_graft_nr - pos - 1);
        commit_graft[pos] = graft;
        return 0;
  }
@@@ -547,7 -545,7 +545,7 @@@ void clear_commit_marks_many(int nr, st
        struct commit_list *list = NULL;
  
        while (nr--) {
 -              commit_list_insert(*commit, &list);
 +              clear_commit_marks_1(&list, *commit, mark);
                commit++;
        }
        while (list)
@@@ -559,6 -557,20 +557,6 @@@ void clear_commit_marks(struct commit *
        clear_commit_marks_many(1, &commit, mark);
  }
  
 -void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
 -{
 -      struct object *object;
 -      struct commit *commit;
 -      unsigned int i;
 -
 -      for (i = 0; i < a->nr; i++) {
 -              object = a->objects[i].item;
 -              commit = lookup_commit_reference_gently(&object->oid, 1);
 -              if (commit)
 -                      clear_commit_marks(commit, mark);
 -      }
 -}
 -
  struct commit *pop_commit(struct commit_list **stack)
  {
        struct commit_list *top = *stack;
@@@ -915,7 -927,8 +913,7 @@@ static int remove_redundant(struct comm
                        if (work[j]->object.flags & PARENT1)
                                redundant[filled_index[j]] = 1;
                clear_commit_marks(array[i], all_flags);
 -              for (j = 0; j < filled; j++)
 -                      clear_commit_marks(work[j], all_flags);
 +              clear_commit_marks_many(filled, work, all_flags);
                free_commit_list(common);
        }
  

diff --combined read-cache.c
index d13ce83794340f36cc09596767d154952c8e42a3,2e8c85c6861920416c4b5447195816aa5df1a4cc..9e0aeffe116959b8d26516f894e531b79b14078f
--- 1/read-cache.c
--- 2/read-cache.c
+++ b/read-cache.c
@@@ -1217,9 -1217,8 +1217,8 @@@ int add_index_entry(struct index_state 
        /* Add it in.. */
        istate->cache_nr++;
        if (istate->cache_nr > pos + 1)
-               memmove(istate->cache + pos + 1,
-                       istate->cache + pos,
-                       (istate->cache_nr - pos - 1) * sizeof(ce));
+               MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos,
+                          istate->cache_nr - pos - 1);
        set_index_entry(istate, pos, ce);
        istate->cache_changed |= CE_ENTRY_ADDED;
        return 0;
@@@ -1603,7 -1602,7 +1602,7 @@@ int hold_locked_index(struct lock_file 
  
  int read_index(struct index_state *istate)
  {
 -      return read_index_from(istate, get_index_file());
 +      return read_index_from(istate, get_index_file(), get_git_dir());
  }
  
  static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
@@@ -1863,19 -1862,20 +1862,19 @@@ unmap
   * This way, shared index can be removed if they have not been used
   * for some time.
   */
 -static void freshen_shared_index(char *base_sha1_hex, int warn)
 +static void freshen_shared_index(const char *shared_index, int warn)
  {
 -      char *shared_index = git_pathdup("sharedindex.%s", base_sha1_hex);
        if (!check_and_freshen_file(shared_index, 1) && warn)
                warning("could not freshen shared index '%s'", shared_index);
 -      free(shared_index);
  }
  
 -int read_index_from(struct index_state *istate, const char *path)
 +int read_index_from(struct index_state *istate, const char *path,
 +                  const char *gitdir)
  {
        struct split_index *split_index;
        int ret;
        char *base_sha1_hex;
 -      const char *base_path;
 +      char *base_path;
  
        /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
        if (istate->initialized)
@@@ -1895,17 -1895,16 +1894,17 @@@
                split_index->base = xcalloc(1, sizeof(*split_index->base));
  
        base_sha1_hex = sha1_to_hex(split_index->base_sha1);
 -      base_path = git_path("sharedindex.%s", base_sha1_hex);
 +      base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_sha1_hex);
        ret = do_read_index(split_index->base, base_path, 1);
        if (hashcmp(split_index->base_sha1, split_index->base->sha1))
                die("broken index, expect %s in %s, got %s",
                    base_sha1_hex, base_path,
                    sha1_to_hex(split_index->base->sha1));
  
 -      freshen_shared_index(base_sha1_hex, 0);
 +      freshen_shared_index(base_path, 0);
        merge_base_index(istate);
        post_read_index_from(istate);
 +      free(base_path);
        return ret;
  }
  
@@@ -2243,7 -2242,7 +2242,7 @@@ static int do_write_index(struct index_
        struct stat st;
        struct ondisk_cache_entry_extended ondisk;
        struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
 -      int drop_cache_tree = 0;
 +      int drop_cache_tree = istate->drop_cache_tree;
  
        for (i = removed = extended = 0; i < entries; i++) {
                if (cache[i]->ce_flags & CE_REMOVE)
@@@ -2573,11 -2572,8 +2572,11 @@@ int write_locked_index(struct index_sta
        ret = write_split_index(istate, lock, flags);
  
        /* Freshen the shared index only if the split-index was written */
 -      if (!ret && !new_shared_index)
 -              freshen_shared_index(sha1_to_hex(si->base_sha1), 1);
 +      if (!ret && !new_shared_index) {
 +              const char *shared_index = git_path("sharedindex.%s",
 +                                                  sha1_to_hex(si->base_sha1));
 +              freshen_shared_index(shared_index, 1);
 +      }
  
  out:
        if (flags & COMMIT_LOCK)