Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' in…

…to js/maint-send-pack-stateless-rpc-deadlock-fix * js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix: sideband_demux(): fix decl-after-stmt
git-mirror · May 17, 2011 · 1c1f046 · 1c1f046
2 parents 80b5b69 + 6143214
commit 1c1f046
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/builtin-send-pack.c b/builtin-send-pack.c
@@ -225,11 +225,11 @@ static void print_helper_status(struct ref *ref)
 
 static int sideband_demux(int in, int out, void *data)
 {
-	int *fd = data;
+	int *fd = data, ret;
 #ifdef NO_PTHREADS
 	close(fd[1]);
 #endif
-	int ret = recv_sideband("send-pack", fd[0], out);
+	ret = recv_sideband("send-pack", fd[0], out);
 	close(out);
 	return ret;
 }