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

gitster · gitster · commit 1c1f046c43d3 · 2011-05-16T17:01:03.000-07:00
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt
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;
 }

Original file line number	Diff line number	Diff line change
`@@ -225,11 +225,11 @@ static void print_helper_status(struct ref *ref)`
`225`	`225`
`226`	`226`	`static int sideband_demux(int in, int out, void *data)`
`227`	`227`	`{`
`228`		`- int *fd = data;`
	`228`	`+ int *fd = data, ret;`
`229`	`229`	`#ifdef NO_PTHREADS`
`230`	`230`	`close(fd[1]);`
`231`	`231`	`#endif`
`232`		`- int ret = recv_sideband("send-pack", fd[0], out);`
	`232`	`+ ret = recv_sideband("send-pack", fd[0], out);`
`233`	`233`	`close(out);`
`234`	`234`	`return ret;`
`235`	`235`	`}`