diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-10 14:35:26 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-10 14:35:26 +0100 |
| commit | e7068fc9bcd57aa91203fe845085b28c0f5ed561 (patch) | |
| tree | 33183235a87de94bd7def69207ac9366504abfd9 /lib/fuse_lowlevel.c | |
| parent | 4aca8d074bfbf55e2d20c64554ac30cbb7717efd (diff) | |
| download | android_external_fuse-e7068fc9bcd57aa91203fe845085b28c0f5ed561.tar.gz android_external_fuse-e7068fc9bcd57aa91203fe845085b28c0f5ed561.tar.bz2 android_external_fuse-e7068fc9bcd57aa91203fe845085b28c0f5ed561.zip | |
libfuse: Cleanup code and update build configuration
Change-Id: Id9600a3b60dec2aa3c9aca06310c88148aeb9278
Diffstat (limited to 'lib/fuse_lowlevel.c')
| -rw-r--r-- | lib/fuse_lowlevel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 5f223c9..97dd678 100644 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -2303,12 +2303,12 @@ static const char *opname(enum fuse_opcode opcode) static int fuse_ll_copy_from_pipe(struct fuse_bufvec *dst, struct fuse_bufvec *src) { - int res = fuse_buf_copy(dst, src, 0); + ssize_t res = fuse_buf_copy(dst, src, 0); if (res < 0) { fprintf(stderr, "fuse: copy from pipe: %s\n", strerror(-res)); return res; } - if (res < fuse_buf_size(dst)) { + if (res < (ssize_t)fuse_buf_size(dst)) { fprintf(stderr, "fuse: copy from pipe: short read\n"); return -1; } @@ -2423,7 +2423,7 @@ static void fuse_ll_process_buf(void *data, const struct fuse_buf *buf, mbuf = newmbuf; tmpbuf = FUSE_BUFVEC_INIT(buf->size - write_header_size); - tmpbuf.buf[0].mem = mbuf + write_header_size; + tmpbuf.buf[0].mem = (intptr_t *)mbuf + write_header_size; res = fuse_ll_copy_from_pipe(&tmpbuf, &bufv); err = -res; @@ -2778,7 +2778,7 @@ int fuse_req_getgroups(fuse_req_t req, int size, gid_t list[]) char *buf; size_t bufsize = 1024; char path[128]; - int ret; + ssize_t ret; int fd; unsigned long pid = req->ctx.pid; char *s; @@ -2802,7 +2802,7 @@ retry: goto out_free; } - if (ret == bufsize) { + if (ret == (ssize_t)bufsize) { free(buf); bufsize *= 4; goto retry; |