diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
tree | f053238978479e408a2b83571443e132f30586ab /src/libmux | |
parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libmux')
-rw-r--r-- | src/libmux/io.c | 5 | ||||
-rw-r--r-- | src/libmux/mux.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/libmux/io.c b/src/libmux/io.c index 3a2a9331..644f07de 100644 --- a/src/libmux/io.c +++ b/src/libmux/io.c @@ -7,7 +7,7 @@ /* * If you fork off two procs running muxrecvproc and muxsendproc, - * then muxrecv/muxsend (and thus muxrpc) will never block except on + * then muxrecv/muxsend (and thus muxrpc) will never block except on * rendevouses, which is nice when it's running in one thread of many. */ void @@ -137,9 +137,8 @@ _muxsend(Mux *mux, void *p) if(mux->send(mux, p) < 0){ qunlock(&mux->outlk); /* vthangup(mux); */ - return -1; + return -1; } qunlock(&mux->outlk); return 0; } - diff --git a/src/libmux/mux.c b/src/libmux/mux.c index 8257fb0e..e7786079 100644 --- a/src/libmux/mux.c +++ b/src/libmux/mux.c @@ -30,7 +30,7 @@ static Muxrpc* allocmuxrpc(Mux *mux) { Muxrpc *r; - + /* must malloc because stack could be private */ r = mallocz(sizeof(Muxrpc), 1); if(r == nil){ @@ -40,7 +40,7 @@ allocmuxrpc(Mux *mux) r->mux = mux; r->r.l = &mux->lk; r->waiting = 1; - + return r; } @@ -49,7 +49,7 @@ tagmuxrpc(Muxrpc *r, void *tx) { int tag; Mux *mux; - + mux = r->mux; /* assign the tag, add selves to response queue */ qlock(&mux->lk); @@ -91,7 +91,7 @@ muxmsgandqlock(Mux *mux, void *p) fprint(2, "%s: bad rpc tag %ux (no one waiting on that tag)\n", argv0, tag); /* must leak packet! don't know how to free it! */ return; - } + } r2->p = p; dequeue(mux, r2); rwakeup(&r2->r); @@ -222,7 +222,7 @@ dequeue(Mux *mux, Muxrpc *r) r->next = nil; } -static int +static int gettag(Mux *mux, Muxrpc *r) { int i, mw; |