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

* js/maint-send-pack-stateless-rpc-deadlock-fix:
  sideband_demux(): fix decl-after-stmt
This commit is contained in:
Junio C Hamano 2011-05-19 20:37:19 -07:00
commit 5c359a6658

View File

@ -228,11 +228,11 @@ static void print_helper_status(struct ref *ref)
static int sideband_demux(int in, int out, void *data) static int sideband_demux(int in, int out, void *data)
{ {
int *fd = data; int *fd = data, ret;
#ifdef NO_PTHREADS #ifdef NO_PTHREADS
close(fd[1]); close(fd[1]);
#endif #endif
int ret = recv_sideband("send-pack", fd[0], out); ret = recv_sideband("send-pack", fd[0], out);
close(out); close(out);
return ret; return ret;
} }