diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2013-02-08 08:03:02 +0100 |
---|---|---|
committer | Miklos Szeredi <mszeredi@suse.cz> | 2013-02-08 08:03:02 +0100 |
commit | 88db3e94ef35aac933334694fa3065da68266d91 (patch) | |
tree | 50b854b53ea69036c53742bc058ea71655447e16 /lib | |
parent | 1d63685572b2692b2152dcd266420f86e5915cd3 (diff) |
libfuse: remove deprecated fuse_read_cmd(), fuse_process_cmd()
Diffstat (limited to 'lib')
-rw-r--r-- | lib/fuse.c | 47 | ||||
-rw-r--r-- | lib/fuse_versionscript | 2 |
2 files changed, 0 insertions, 49 deletions
@@ -4048,18 +4048,6 @@ int fuse_notify_poll(struct fuse_pollhandle *ph) return fuse_lowlevel_notify_poll(ph); } -static void free_cmd(struct fuse_cmd *cmd) -{ - free(cmd->buf); - free(cmd); -} - -void fuse_process_cmd(struct fuse *f, struct fuse_cmd *cmd) -{ - fuse_session_process(f->se, cmd->buf, cmd->buflen, cmd->ch); - free_cmd(cmd); -} - int fuse_exited(struct fuse *f) { return fuse_session_exited(f->se); @@ -4070,41 +4058,6 @@ struct fuse_session *fuse_get_session(struct fuse *f) return f->se; } -static struct fuse_cmd *fuse_alloc_cmd(size_t bufsize) -{ - struct fuse_cmd *cmd = (struct fuse_cmd *) malloc(sizeof(*cmd)); - if (cmd == NULL) { - fprintf(stderr, "fuse: failed to allocate cmd\n"); - return NULL; - } - cmd->buf = (char *) malloc(bufsize); - if (cmd->buf == NULL) { - fprintf(stderr, "fuse: failed to allocate read buffer\n"); - free(cmd); - return NULL; - } - return cmd; -} - -struct fuse_cmd *fuse_read_cmd(struct fuse *f) -{ - struct fuse_chan *ch = fuse_session_next_chan(f->se, NULL); - size_t bufsize = fuse_chan_bufsize(ch); - struct fuse_cmd *cmd = fuse_alloc_cmd(bufsize); - if (cmd != NULL) { - int res = fuse_chan_recv(&ch, cmd->buf, bufsize); - if (res <= 0) { - free_cmd(cmd); - if (res < 0 && res != -EINTR && res != -EAGAIN) - fuse_exit(f); - return NULL; - } - cmd->buflen = res; - cmd->ch = ch; - } - return cmd; -} - static int fuse_session_loop_remember(struct fuse *f) { struct fuse_session *se = f->se; diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript index 20d84f9..6e72dd6 100644 --- a/lib/fuse_versionscript +++ b/lib/fuse_versionscript @@ -6,8 +6,6 @@ FUSE_3.0 { fuse_loop; fuse_loop_mt; fuse_main; - fuse_process_cmd; - fuse_read_cmd; fuse_chan_bufsize; fuse_chan_data; fuse_chan_destroy; |