aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2011-03-29 17:31:30 +0000
committerJonathan Nieder <jrnieder@gmail.com>2011-03-29 14:47:02 -0500
commit9e113988d3d95f1595e2c33f704defeb2cbcc5d6 (patch)
treeaae49d07c0f1c1bb0fcd94d81606837b7785af65
parent4c502d68666acba7a83379c7abd971aafee91cf8 (diff)
downloadgit-9e113988d3d95f1595e2c33f704defeb2cbcc5d6.tar.gz
git-9e113988d3d95f1595e2c33f704defeb2cbcc5d6.tar.xz
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>
-rw-r--r--vcs-svn/svndump.c3
1 files changed, 2 insertions, 1 deletions
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);