From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Antoine Pelisse <apelisse@gmail.com>
Subject: [PATCH 3/5] diff --stat: use "file" temporary variable to refer to data->files[i]
Date: Tue, 27 Nov 2012 13:21:48 -0800 [thread overview]
Message-ID: <1354051310-29093-4-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1354051310-29093-1-git-send-email-gitster@pobox.com>
The generated code shouldn't change but it is easier to read.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/diff.c b/diff.c
index ce6baa4..e4e70e5 100644
--- a/diff.c
+++ b/diff.c
@@ -1470,8 +1470,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
for (i = 0; (i < count) && (i < data->nr); i++) {
struct diffstat_file *file = data->files[i];
uintmax_t change = file->added + file->deleted;
- if (!data->files[i]->is_interesting &&
- (change == 0)) {
+
+ if (!file->is_interesting && (change == 0)) {
count++; /* not shown == room for one more */
continue;
}
@@ -1586,13 +1586,13 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
*/
for (i = 0; i < count; i++) {
const char *prefix = "";
- char *name = data->files[i]->print_name;
- uintmax_t added = data->files[i]->added;
- uintmax_t deleted = data->files[i]->deleted;
+ struct diffstat_file *file = data->files[i];
+ char *name = file->print_name;
+ uintmax_t added = file->added;
+ uintmax_t deleted = file->deleted;
int name_len;
- if (!data->files[i]->is_interesting &&
- (added + deleted == 0)) {
+ if (!file->is_interesting && (added + deleted == 0)) {
total_files--;
continue;
}
@@ -1611,7 +1611,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
name = slash;
}
- if (data->files[i]->is_binary) {
+ if (file->is_binary) {
fprintf(options->file, "%s", line_prefix);
show_name(options->file, prefix, name, len);
fprintf(options->file, " %*s", number_width, "Bin");
@@ -1628,7 +1628,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
fprintf(options->file, "\n");
continue;
}
- else if (data->files[i]->is_unmerged) {
+ else if (file->is_unmerged) {
fprintf(options->file, "%s", line_prefix);
show_name(options->file, prefix, name, len);
fprintf(options->file, " Unmerged\n");
@@ -1668,10 +1668,10 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
fprintf(options->file, "\n");
}
for (i = count; i < data->nr; i++) {
- uintmax_t added = data->files[i]->added;
- uintmax_t deleted = data->files[i]->deleted;
- if (!data->files[i]->is_interesting &&
- (added + deleted == 0)) {
+ struct diffstat_file *file = data->files[i];
+ uintmax_t added = file->added;
+ uintmax_t deleted = file->deleted;
+ if (!file->is_interesting && (added + deleted == 0)) {
total_files--;
continue;
}
--
1.8.0.1.331.g808d2af
next prev parent reply other threads:[~2012-11-27 21:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 21:21 [PATCH 0/5] "diff --stat" counting fixes Junio C Hamano
2012-11-27 21:21 ` [PATCH 1/5] test: add failing tests for "diff --stat" to t4049 Junio C Hamano
2012-11-27 21:21 ` [PATCH 2/5] diff --stat: status of unmodified pair in diff-q is not zero Junio C Hamano
2012-11-27 21:21 ` Junio C Hamano [this message]
2012-11-27 21:21 ` [PATCH 4/5] diff --stat: move the "total count" logic to the last loop Junio C Hamano
2012-11-27 21:21 ` [PATCH 5/5] diff --stat: do not count "unmerged" entries Junio C Hamano
2012-11-27 22:21 ` [PATCH 6/5] diff --shortstat: " Junio C Hamano
2012-11-29 8:22 ` [PATCH] t4049: avoid test failures on filemode challenged file systems (Windows) Johannes Sixt
2012-11-29 16:13 ` Junio C Hamano
2012-11-29 17:51 ` Junio C Hamano
2012-11-29 20:48 ` Junio C Hamano
2012-11-30 7:46 ` Johannes Sixt
2012-12-02 2:24 ` Junio C Hamano
2012-12-01 10:29 ` [PATCH 0/5] "diff --stat" counting fixes Antoine Pelisse
2012-12-02 2:23 ` Junio C Hamano
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=1354051310-29093-4-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
/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).