From 561d7054d856eea6c2d634093546d6af773dada9 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 21 Jun 2013 18:17:27 +0200 Subject: libfuse: remove fuse_chan_bufsize() Remove fuse_chan_bufsize() from the lowlevel API. fuse_session_receive_buf() is now responsible for allocating memory for the buffer. --- lib/fuse.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'lib/fuse.c') diff --git a/lib/fuse.c b/lib/fuse.c index 8047933..d859482 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -4022,25 +4022,17 @@ static int fuse_session_loop_remember(struct fuse *f) struct timespec now; time_t next_clean; struct fuse_chan *ch = fuse_session_chan(se); - size_t bufsize = fuse_chan_bufsize(ch); - char *buf = (char *) malloc(bufsize); struct pollfd fds = { .fd = fuse_chan_fd(ch), .events = POLLIN }; - - if (!buf) { - fprintf(stderr, "fuse: failed to allocate read buffer\n"); - return -1; - } + struct fuse_buf fbuf = { + .mem = NULL, + }; curr_time(&now); next_clean = now.tv_sec; while (!fuse_session_exited(se)) { - struct fuse_buf fbuf = { - .mem = buf, - .size = bufsize, - }; unsigned timeout; curr_time(&now); @@ -4071,7 +4063,7 @@ static int fuse_session_loop_remember(struct fuse *f) } } - free(buf); + free(fbuf.mem); fuse_session_reset(se); return res < 0 ? -1 : 0; } -- cgit v1.2.3