From: Michael Witten <mfwitten@gmail.com>
Date: Tue, 29 Mar 2011 17:31:30 +0000 (+0000)
Subject: vcs-svn: a void function shouldn't try to return something
X-Git-Tag: v1.7.5-rc0~3^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e113988d3d95f1595e2c33f704defeb2cbcc5d6;p=git.git

vcs-svn: a void function shouldn't try to return something

As v1.7.4-rc0~184 (2010-10-04) and C99 §6.8.6.4.1 remind us, standard
C does not permit returning an expression of type void, even for a
tail call.

Noticed with gcc -pedantic:

 vcs-svn/svndump.c: In function 'handle_node':
 vcs-svn/svndump.c:213:3: warning: ISO C forbids 'return' with expression,
  in function returning void [-pedantic]

[jn: with simplified log message]

Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index eef49ca19..572a99596 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -214,7 +214,8 @@ static void handle_node(void)
 		if (have_text || have_props || node_ctx.srcRev)
 			die("invalid dump: deletion node has "
 				"copyfrom info, text, or properties");
-		return repo_delete(node_ctx.dst);
+		repo_delete(node_ctx.dst);
+		return;
 	}
 	if (node_ctx.action == NODEACT_REPLACE) {
 		repo_delete(node_ctx.dst);