[PATCH 1/4] Start to replace locate_rename_dst() with a generic function.
From: Yann Dirson <hidden>
Date: 2016-06-15 22:49:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
First we introduce the trivial changes: replace hardcoded references to rename_dst_nr, rename_dst_alloc to parameters. Signed-off-by: Yann Dirson <redacted> --- diffcore-rename.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/diffcore-rename.c b/diffcore-rename.c
index df41be5..fc554e4 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c@@ -6,6 +6,10 @@ #include "diffcore.h" #include "hash.h" +#define locate_element(list,elem,insert_ok) \ + _locate_element(elem, &list##_nr, &list##_alloc, \ + insert_ok) + /* Table of rename/copy destinations */ static struct diff_rename_dst {
@@ -13,14 +17,17 @@ static struct diff_rename_dst { struct diff_filepair *pair; } *rename_dst; static int rename_dst_nr, rename_dst_alloc; +#define locate_rename_dst(elem,insert_ok) \ + locate_element(rename_dst, elem, insert_ok) -static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two, - int insert_ok) +static struct diff_rename_dst *_locate_element(struct diff_filespec *two, + int *elem_nr_p, int *elem_alloc_p, + int insert_ok) { int first, last; first = 0; - last = rename_dst_nr; + last = (*elem_nr_p); while (last > first) { int next = (last + first) >> 1; struct diff_rename_dst *dst = &(rename_dst[next]);
@@ -37,15 +44,15 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two, if (!insert_ok) return NULL; /* insert to make it at "first" */ - if (rename_dst_alloc <= rename_dst_nr) { - rename_dst_alloc = alloc_nr(rename_dst_alloc); + if ((*elem_alloc_p) <= (*elem_nr_p)) { + (*elem_alloc_p) = alloc_nr(*elem_alloc_p); rename_dst = xrealloc(rename_dst, - rename_dst_alloc * sizeof(*rename_dst)); + (*elem_alloc_p) * sizeof(*rename_dst)); } - rename_dst_nr++; - if (first < rename_dst_nr) + (*elem_nr_p)++; + if (first < (*elem_nr_p)) memmove(rename_dst + first + 1, rename_dst + first, - (rename_dst_nr - first - 1) * sizeof(*rename_dst)); + ((*elem_nr_p) - first - 1) * sizeof(*rename_dst)); rename_dst[first].two = alloc_filespec(two->path); fill_filespec(rename_dst[first].two, two->sha1, two->mode); rename_dst[first].pair = NULL;
--
1.7.2.3