threads / patch / 368

patchdiff-cache.c compilation warning fix.

Subject: [PATCH] diff-cache.c compilation warning fix.

## tl;dr

2 messages between Apr 28, 2005 and Apr 28, 2005. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Junio C Hamano· Apr 28, 2005, 04:15 UTC · lore

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

Show changes to diff +1 −1
@@ -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;
Junio C Hamano· Apr 28, 2005, 04:59 UTC · re: Junio C Hamano · lore

[PATCH (take 2)] diff-cache.c compilation warning fix.

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

Show changes to diff +2 −2
@@ -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);
 }

← back to recent threads