From: Elijah Newren <newren@xxxxxxxxx>
This is a purely cosmetic change for now, but we will be adding
additional information to the struct and changing where and how it is
setup and used in subsequent patches.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
diffcore-rename.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 614a8d63012d..7759c9a3a2ed 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -367,6 +367,11 @@ static int find_exact_renames(struct diff_options *options)
return renames;
}
+struct dir_rename_info {
+ struct strmap *dir_rename_count;
+ unsigned setup;
+};
+
static void dirname_munge(char *filename)
{
char *slash = strrchr(filename, '/');
@@ -375,7 +380,7 @@ static void dirname_munge(char *filename)
*slash = '\0';
}
-static void increment_count(struct strmap *dir_rename_count,
+static void increment_count(struct dir_rename_info *info,
char *old_dir,
char *new_dir)
{
@@ -383,20 +388,20 @@ static void increment_count(struct strmap *dir_rename_count,
struct strmap_entry *e;
/* Get the {new_dirs -> counts} mapping using old_dir */
- e = strmap_get_entry(dir_rename_count, old_dir);
+ e = strmap_get_entry(info->dir_rename_count, old_dir);
if (e) {
counts = e->value;
} else {
counts = xmalloc(sizeof(*counts));
strintmap_init_with_options(counts, 0, NULL, 1);
- strmap_put(dir_rename_count, old_dir, counts);
+ strmap_put(info->dir_rename_count, old_dir, counts);
}
/* Increment the count for new_dir */
strintmap_incr(counts, new_dir, 1);
}
-static void update_dir_rename_counts(struct strmap *dir_rename_count,
+static void update_dir_rename_counts(struct dir_rename_info *info,
struct strset *dirs_removed,
const char *oldname,
const char *newname)
@@ -450,7 +455,7 @@ static void update_dir_rename_counts(struct strmap *dir_rename_count,
}
if (strset_contains(dirs_removed, old_dir))
- increment_count(dir_rename_count, old_dir, new_dir);
+ increment_count(info, old_dir, new_dir);
else
break;
@@ -466,12 +471,15 @@ static void update_dir_rename_counts(struct strmap *dir_rename_count,
free(new_dir);
}
-static void compute_dir_rename_counts(struct strmap *dir_rename_count,
- struct strset *dirs_removed)
+static void compute_dir_rename_counts(struct dir_rename_info *info,
+ struct strset *dirs_removed,
+ struct strmap *dir_rename_count)
{
int i;
- /* Set up dir_rename_count */
+ info->setup = 1;
+ info->dir_rename_count = dir_rename_count;
+
for (i = 0; i < rename_dst_nr; ++i) {
/*
* Make dir_rename_count contain a map of a map:
@@ -480,7 +488,7 @@ static void compute_dir_rename_counts(struct strmap *dir_rename_count,
* the old filename and the new filename and count how many
* times that pairing occurs.
*/
- update_dir_rename_counts(dir_rename_count, dirs_removed,
+ update_dir_rename_counts(info, dirs_removed,
rename_dst[i].p->one->path,
rename_dst[i].p->two->path);
}
@@ -499,10 +507,13 @@ void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
}
MAYBE_UNUSED
-static void clear_dir_rename_count(struct strmap *dir_rename_count)
+static void cleanup_dir_rename_info(struct dir_rename_info *info)
{
- partial_clear_dir_rename_count(dir_rename_count);
- strmap_clear(dir_rename_count, 1);
+ if (!info->setup)
+ return;
+
+ partial_clear_dir_rename_count(info->dir_rename_count);
+ strmap_clear(info->dir_rename_count, 1);
}
static const char *get_basename(const char *filename)
@@ -791,8 +802,10 @@ void diffcore_rename_extended(struct diff_options *options,
int num_destinations, dst_cnt;
int num_sources, want_copies;
struct progress *progress = NULL;
+ struct dir_rename_info info;
trace2_region_enter("diff", "setup", options->repo);
+ info.setup = 0;
assert(!dir_rename_count || strmap_empty(dir_rename_count));
want_copies = (detect_rename == DIFF_DETECT_COPY);
if (!minimum_score)
@@ -985,7 +998,7 @@ void diffcore_rename_extended(struct diff_options *options,
/*
* Now that renames have been computed, compute dir_rename_count */
if (dirs_removed && dir_rename_count)
- compute_dir_rename_counts(dir_rename_count, dirs_removed);
+ compute_dir_rename_counts(&info, dirs_removed, dir_rename_count);
/* At this point, we have found some renames and copies and they
* are recorded in rename_dst. The original list is still in *q.
--
gitgitgadget
