diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2013-06-21 13:35:30 +0200 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2013-06-21 13:35:30 +0200 |
commit | 2bcfd55fc145430e49193715417ced10d58d7b54 (patch) | |
tree | e041c58ce5530b6150d2bf6437d689ff8294d9c3 /lib | |
parent | af57c73304b8a23c6ca0e1aebf4ce49071ac784a (diff) |
libfuse: replace fuse_session_next_chan
Replace fuse_session_next_chan() with fuse_session_chan(), as multiple
channels per session were never actually supported and probably never will.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fuse.c | 2 | ||||
-rw-r--r-- | lib/fuse_loop.c | 2 | ||||
-rw-r--r-- | lib/fuse_loop_mt.c | 2 | ||||
-rw-r--r-- | lib/fuse_session.c | 9 | ||||
-rw-r--r-- | lib/fuse_versionscript | 2 | ||||
-rw-r--r-- | lib/helper.c | 2 |
6 files changed, 7 insertions, 12 deletions
@@ -4021,7 +4021,7 @@ static int fuse_session_loop_remember(struct fuse *f) int res = 0; struct timespec now; time_t next_clean; - struct fuse_chan *ch = fuse_session_next_chan(se, NULL); + struct fuse_chan *ch = fuse_session_chan(se); size_t bufsize = fuse_chan_bufsize(ch); char *buf = (char *) malloc(bufsize); struct pollfd fds = { diff --git a/lib/fuse_loop.c b/lib/fuse_loop.c index b7b4ca4..987a8d7 100644 --- a/lib/fuse_loop.c +++ b/lib/fuse_loop.c @@ -15,7 +15,7 @@ int fuse_session_loop(struct fuse_session *se) { int res = 0; - struct fuse_chan *ch = fuse_session_next_chan(se, NULL); + struct fuse_chan *ch = fuse_session_chan(se); size_t bufsize = fuse_chan_bufsize(ch); char *buf = (char *) malloc(bufsize); if (!buf) { diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c index 82e3001..f328fec 100644 --- a/lib/fuse_loop_mt.c +++ b/lib/fuse_loop_mt.c @@ -224,7 +224,7 @@ int fuse_session_loop_mt(struct fuse_session *se) memset(&mt, 0, sizeof(struct fuse_mt)); mt.se = se; - mt.prevch = fuse_session_next_chan(se, NULL); + mt.prevch = fuse_session_chan(se); mt.error = 0; mt.numworker = 0; mt.numavail = 0; diff --git a/lib/fuse_session.c b/lib/fuse_session.c index 80bf0ea..2a4fc8d 100644 --- a/lib/fuse_session.c +++ b/lib/fuse_session.c @@ -58,14 +58,9 @@ void fuse_session_remove_chan(struct fuse_chan *ch) } } -struct fuse_chan *fuse_session_next_chan(struct fuse_session *se, - struct fuse_chan *ch) +struct fuse_chan *fuse_session_chan(struct fuse_session *se) { - assert(ch == NULL || ch == se->ch); - if (ch == NULL) - return se->ch; - else - return NULL; + return se->ch; } void fuse_session_process(struct fuse_session *se, const char *buf, size_t len, diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index 7c717f4..391c4f8 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -25,7 +25,7 @@ FUSE_3.0 { fuse_session_loop; fuse_session_loop_mt; fuse_session_new; - fuse_session_next_chan; + fuse_session_chan; fuse_session_process; fuse_session_reset; fuse_opt_parse; diff --git a/lib/helper.c b/lib/helper.c index 58dfb43..139e1ae 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -299,7 +299,7 @@ err_free: static void fuse_teardown(struct fuse *fuse, char *mountpoint) { struct fuse_session *se = fuse_get_session(fuse); - struct fuse_chan *ch = fuse_session_next_chan(se, NULL); + struct fuse_chan *ch = fuse_session_chan(se); fuse_remove_signal_handlers(se); fuse_unmount(mountpoint, ch); fuse_destroy(fuse); |