* [PATCH] diff-cache.c compilation warning fix.
@ 2005-04-28 4:15 Junio C Hamano
2005-04-28 4:59 ` [PATCH (take 2)] " Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Junio C Hamano @ 2005-04-28 4:15 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
Nobody uses return value from show_new_file() function but it is
defined as returning int and falls off at the end without
returning. Make it void.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
diff-cache.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
# - [PATCH] diff-tree -p implies diff-tree -p -r
# + working tree
--- k/diff-cache.c
+++ l/diff-cache.c
@@ -38,7 +38,7 @@ static int get_stat_data(struct cache_en
return 0;
}
-static int show_new_file(struct cache_entry *new)
+static void show_new_file(struct cache_entry *new)
{
unsigned char *sha1;
unsigned int mode;
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH (take 2)] diff-cache.c compilation warning fix.
2005-04-28 4:15 [PATCH] diff-cache.c compilation warning fix Junio C Hamano
@ 2005-04-28 4:59 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2005-04-28 4:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
Nobody uses return value from show_new_file() function but it is
defined as returning int and falls off at the end without
returning. Make it void.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
This is take 2. Earlier one was a botched patch that left
"return -1" in the function.
diff-cache.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
# - [PATCH] diff-tree -p implies diff-tree -p -r
# + 04/27 21:50 diff.c clean up temporary file.
--- k/diff-cache.c
+++ l/diff-cache.c
@@ -38,14 +38,14 @@ static int get_stat_data(struct cache_en
return 0;
}
-static int show_new_file(struct cache_entry *new)
+static void show_new_file(struct cache_entry *new)
{
unsigned char *sha1;
unsigned int mode;
/* New file in the index: it might actually be different in the working copy */
if (get_stat_data(new, &sha1, &mode) < 0)
- return -1;
+ return;
show_file("+", new, sha1, mode);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-04-28 4:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-28 4:15 [PATCH] diff-cache.c compilation warning fix Junio C Hamano
2005-04-28 4:59 ` [PATCH (take 2)] " Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox