git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ping Yin <pkufranky@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Ping Yin <pkufranky@gmail.com>
Subject: [PATCH v2 1/5] diff.c: Remove code redundancy in diff_words_show
Date: Sat,  3 May 2008 19:57:04 +0800	[thread overview]
Message-ID: <1209815828-6548-2-git-send-email-pkufranky@gmail.com> (raw)
In-Reply-To: <1209815828-6548-1-git-send-email-pkufranky@gmail.com>

Introduce mmfile_copy_set_boundary to do the repeated work.

Signed-off-by: Ping Yin <pkufranky@gmail.com>
---
 diff.c |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/diff.c b/diff.c
index 3632b55..acef138 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 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)
 {
@@ -444,20 +455,9 @@ static void diff_words_show(struct diff_words_data *diff_words)
 	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

  reply	other threads:[~2008-05-03 11:58 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-02  3:39 [PATCH] Make words boundary for --color-words configurable Ping Yin
2008-05-02  3:54 ` Junio C Hamano
2008-05-02  4:28   ` Ping Yin
2008-05-02 13:59     ` [PATCH] Make boundary characters " Ping Yin
2008-05-02 14:26       ` Ping Yin
2008-05-02 14:27         ` Ping Yin
2008-05-03 11:57         ` [PATCH v2 0/5] " Ping Yin
2008-05-03 11:57           ` Ping Yin [this message]
2008-05-03 11:57             ` [PATCH v2 2/5] diff.c: Use show variable name in fn_out_diff_words_aux Ping Yin
2008-05-03 11:57               ` [PATCH v2 3/5] diff.c: Fix --color-words showing trailing deleted words at another line Ping Yin
2008-05-03 11:57                 ` [PATCH v2 4/5] Make boundary characters for --color-words configurable Ping Yin
2008-05-03 11:57                   ` [PATCH v2 5/5] fn_out_diff_words_aux: Handle common diff line more carefully Ping Yin
2008-05-03 18:18                   ` [PATCH v2 4/5] Make boundary characters for --color-words configurable Junio C Hamano
2008-05-03 18:41                     ` Teemu Likonen
2008-05-04  0:32                     ` Ping Yin
2008-05-04  9:44                       ` Johannes Schindelin
2008-05-04 16:35                         ` Ping Yin
2008-05-04 20:16                           ` Junio C Hamano
2008-05-04 20:47                             ` Jakub Narebski
2008-05-04 21:27                               ` Teemu Likonen
2008-05-05 12:14                               ` Johannes Schindelin
2008-05-05  1:40                             ` Ping Yin
2008-05-05  5:00                               ` Junio C Hamano
2008-05-05 12:10                                 ` Ping Yin
2008-05-06  0:40                                   ` Ping Yin
2008-05-06  8:55                                     ` Johannes Schindelin
2008-05-07  1:15                                       ` Ping Yin
2008-05-07 11:24                                         ` Johannes Schindelin
2008-05-07 12:19                                           ` Ping Yin
2008-05-07 13:10                                             ` Johannes Schindelin
2008-05-07 14:11                                               ` Ping Yin
2008-05-07 19:13                                           ` Junio C Hamano
2008-05-07 19:33                                             ` Junio C Hamano
2008-05-07 19:45                                             ` Jeff King
2008-05-07 20:02                                               ` Junio C Hamano
2008-05-07 22:04                                                 ` Jeff King
2008-05-08 10:34                                             ` Teemu Likonen
2008-05-10  9:02                                               ` Ping Yin
2008-05-10  9:14                                                 ` Teemu Likonen
2008-05-11 13:16                                                 ` Ping Yin
2008-05-11 13:27                                                   ` Ping Yin
2008-05-11 16:27                                                   ` Junio C Hamano
2008-05-12 16:31                                                     ` Ping Yin
2008-05-12 18:57                                                       ` Jakub Narebski
2008-05-12 19:17                                                         ` Junio C Hamano
2008-05-12 19:57                                                           ` Jakub Narebski
2008-05-13  1:37                                                           ` Ping Yin
2008-05-13  1:42                                                         ` Ping Yin
2008-05-10  8:20                                             ` Ping Yin
2008-05-05 11:51                           ` Johannes Schindelin
2008-05-05 12:02                             ` Ping Yin
2008-05-03 18:01                 ` [PATCH v2 3/5] diff.c: Fix --color-words showing trailing deleted words at another line Junio C Hamano
2008-05-03 12:01               ` [PATCH v2 2/5] diff.c: Use show variable name in fn_out_diff_words_aux Ping Yin
2008-05-03 17:47               ` Junio C Hamano
2008-05-03 18:20             ` [PATCH v2 1/5] diff.c: Remove code redundancy in diff_words_show Junio C Hamano
2008-05-04  4:20           ` [PATCH v3 0/6] --color-words improvement Ping Yin
2008-05-04  4:20             ` [PATCH v3 1/6] diff.c: Remove code redundancy in diff_words_show Ping Yin
2008-05-04  4:20               ` [PATCH v3 2/6] fn_out_diff_words_aux: Use short variable name Ping Yin
2008-05-04  4:20                 ` [PATCH v3 3/6] --color-words: Fix showing trailing deleted words at another line Ping Yin
2008-05-04  4:20                   ` [PATCH v3 4/6] --color-words: Make non-word characters configurable Ping Yin
2008-05-04  4:20                     ` [PATCH v3 5/6] fn_out_diff_words_aux: Handle common diff line more carefully Ping Yin
2008-05-04  4:20                       ` [PATCH v3 6/6] --color-words: Add test t4030 Ping Yin
2008-05-04  9:54                       ` [PATCH v3 5/6] fn_out_diff_words_aux: Handle common diff line more carefully Johannes Schindelin
2008-05-04 16:53                         ` Ping Yin
2008-05-05 12:11                           ` Johannes Schindelin
2008-05-05 14:18                             ` Ping Yin
2008-05-04  6:45                     ` [PATCH v3 4/6] --color-words: Make non-word characters configurable Junio C Hamano
2008-05-04  7:04                       ` Ping Yin
2008-05-04  9:52                   ` [PATCH v3 3/6] --color-words: Fix showing trailing deleted words at another line Johannes Schindelin
2008-05-04 16:48                     ` Ping Yin
2008-05-05 12:10                       ` Johannes Schindelin
2008-05-04  9:47                 ` [PATCH v3 2/6] fn_out_diff_words_aux: Use short variable name Johannes Schindelin
2008-05-04 16:39                   ` Ping Yin
2008-05-05 12:05                     ` Johannes Schindelin
2008-05-04  9:46               ` [PATCH v3 1/6] diff.c: Remove code redundancy in diff_words_show Johannes Schindelin
2008-05-02 14:36       ` [PATCH] Make boundary characters for --color-words configurable Teemu Likonen
2008-05-03  0:22         ` Ping Yin
2008-05-03 13:22           ` Dirk Süsserott
2008-05-03 13:57             ` Ping Yin
2008-05-03 14:03       ` [PATCH] --color-words: Make the word characters configurable Johannes Schindelin
2008-05-03 14:13         ` Ping Yin
2008-05-03 14:23           ` Johannes Schindelin
2008-05-03 14:43         ` Teemu Likonen
2008-05-04  9:18           ` Johannes Schindelin
2008-05-03 17:43         ` Junio C Hamano
2008-05-04  9:25           ` Johannes Schindelin
2008-05-02  7:45 ` [PATCH] Make words boundary for --color-words configurable Johannes Schindelin
2008-05-02  8:14   ` Teemu Likonen
2008-05-02  9:23     ` Ping Yin
2008-05-02 10:01     ` Teemu Likonen
2008-05-02  9:28   ` Ping Yin
2008-05-03  0:18   ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1209815828-6548-2-git-send-email-pkufranky@gmail.com \
    --to=pkufranky@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).