From 5334a152e1272a072339fb4519de04ed4269d3ca Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 21 Jun 2013 18:17:27 +0200 Subject: libfuse: remove fuse_chan_(send|receive) Move the fuse_chan_ops.send and .receive implementations to fuse_lowlevel.c. The abstraction wasn't actually useful and made the the splice implementation more difficult. Remove fuse_chan_ops.send and fuse_chan_ops.receive. --- lib/fuse_session.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'lib/fuse_session.c') diff --git a/lib/fuse_session.c b/lib/fuse_session.c index f535720..318cfee 100644 --- a/lib/fuse_session.c +++ b/lib/fuse_session.c @@ -69,19 +69,9 @@ void fuse_session_process_buf(struct fuse_session *se, } int fuse_session_receive_buf(struct fuse_session *se, struct fuse_buf *buf, - struct fuse_chan **chp) + struct fuse_chan *ch) { - int res; - - if (se->receive_buf) { - res = se->receive_buf(se, buf, chp); - } else { - res = fuse_chan_recv(chp, buf->mem, buf->size); - if (res > 0) - buf->size = res; - } - - return res; + return se->receive_buf(se, buf, ch); } int fuse_chan_clearfd(struct fuse_chan *ch) @@ -151,18 +141,6 @@ struct fuse_session *fuse_chan_session(struct fuse_chan *ch) return ch->se; } -int fuse_chan_recv(struct fuse_chan **chp, char *buf, size_t size) -{ - struct fuse_chan *ch = *chp; - - return ch->op.receive(chp, buf, size); -} - -int fuse_chan_send(struct fuse_chan *ch, const struct iovec iov[], size_t count) -{ - return ch->op.send(ch, iov, count); -} - void fuse_chan_destroy(struct fuse_chan *ch) { fuse_session_remove_chan(ch); -- cgit v1.2.3