[PATCH v3 1/6] diff.c: Remove code redundancy in diff_words_show
Introduce mmfile_copy_set_boundary to do the repeated work.
Signed-off-by: Ping Yin <pkufranky@gmail.com>
---
diff.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/diff.c b/diff.c
index 3632b55..6633c9c 100644
--- a/diff.c
+++ b/diff.c
@@ -434,6 +434,17 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
}
}
+static void mmfile_copy_set_boundary(mmfile_t *dest, mmfile_t *src) {
+ int i;
+
+ dest->size = src->size;
+ dest->ptr = xmalloc(dest->size);
+ memcpy(dest->ptr, src->ptr, dest->size);
+ for (i = 0; i < dest->size; i++)
+ if (isspace(dest->ptr[i]))
+ dest->ptr[i] = '\n';
+}
+
/* this executes the word diff on the accumulated buffers */
static void diff_words_show(struct diff_words_data *diff_words)
{
@@ -441,23 +452,11 @@ static void diff_words_show(struct diff_words_data *diff_words)
xdemitconf_t xecfg;
xdemitcb_t ecb;
mmfile_t minus, plus;
- int i;
memset(&xecfg, 0, sizeof(xecfg));
- minus.size = diff_words->minus.text.size;
- minus.ptr = xmalloc(minus.size);
- memcpy(minus.ptr, diff_words->minus.text.ptr, minus.size);
- for (i = 0; i < minus.size; i++)
- if (isspace(minus.ptr[i]))
- minus.ptr[i] = '\n';
+ mmfile_copy_set_boundary(&minus, &(diff_words->minus.text));
diff_words->minus.current = 0;
-
- plus.size = diff_words->plus.text.size;
- plus.ptr = xmalloc(plus.size);
- memcpy(plus.ptr, diff_words->plus.text.ptr, plus.size);
- for (i = 0; i < plus.size; i++)
- if (isspace(plus.ptr[i]))
- plus.ptr[i] = '\n';
+ mmfile_copy_set_boundary(&plus, &(diff_words->plus.text));
diff_words->plus.current = 0;
xpp.flags = XDF_NEED_MINIMAL;
--
1.5.5.1.121.g26b3
Ping Yin <pkufranky@gmail.com>