summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-08-03 13:44:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-03 19:48:41 (GMT)
commit7c5b1675a88a52be1822129e4aa915c5531f6700 (patch)
tree6af503f9bf6be6fc7b53252c4b57248f9b74320a
parentb003c00b7b5e352569061fec0b1e1bd0d0fa8b6a (diff)
downloadgit-7c5b1675a88a52be1822129e4aa915c5531f6700.zip
git-7c5b1675a88a52be1822129e4aa915c5531f6700.tar.gz
git-7c5b1675a88a52be1822129e4aa915c5531f6700.tar.bz2
git-name-rev: don't use printf without format
printf() without an explicit format string is not a good coding practise, unless the printed string is guaranteed to not contain percent signs. While fixing this, we might as well combine the calls to fwrite() and printf(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-name-rev.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index ff7d638..5352bc8 100644
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
@@ -189,6 +189,7 @@ static void name_rev_line(char *p, struct name_ref_data *data)
unsigned char sha1[40];
const char *name = NULL;
char c = *(p+1);
+ int p_len = p - p_start + 1;
forty = 0;
@@ -204,13 +205,10 @@ static void name_rev_line(char *p, struct name_ref_data *data)
if (!name)
continue;
- if (data->name_only) {
- fwrite(p_start, p - p_start + 1 - 40, 1, stdout);
- printf(name);
- } else {
- fwrite(p_start, p - p_start + 1, 1, stdout);
- printf(" (%s)", name);
- }
+ if (data->name_only)
+ printf("%.*s%s", p_len - 40, p_start, name);
+ else
+ printf("%.*s (%s)", p_len, p_start, name);
p_start = p + 1;
}
}