From 5b7c484b64aa9ca548901e2064e86341ba6bb286 Mon Sep 17 00:00:00 2001 From: Ikey Doherty Date: Tue, 17 May 2016 15:17:05 +0100 Subject: [PATCH] Fix up some warnings Signed-off-by: Ikey Doherty --- src/fuse.c | 5 +++-- src/prepare.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fuse.c b/src/fuse.c index 021e93b..90e0725 100644 --- a/src/fuse.c +++ b/src/fuse.c @@ -576,7 +576,7 @@ int save_dir; static void *xmp_init(__nc_unused__ struct fuse_conn_info *conn) { - fchdir(save_dir); + __nc_unused__ int r = fchdir(save_dir); close(save_dir); return NULL; @@ -633,7 +633,8 @@ int main(__nc_unused__ int argc, __nc_unused__ char *argv[]) sleep(1); if (access("/sys/module/fuse/", F_OK)) { - system("modprobe fuse"); + /* Failure would happen later in fuse_main, reduce double checks. */ + __nc_unused__ int ret = system("modprobe fuse"); } signal(SIGPIPE, SIG_IGN); diff --git a/src/prepare.c b/src/prepare.c index 7930981..004cd49 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -202,7 +202,9 @@ static void recurse_dir(char *base1, char *base2, char *path) newpath = NULL; fullpath2 = NULL; - asprintf(&fullpath2, "%s/%s", fullpath1, entry->d_name); + if (asprintf(&fullpath2, "%s/%s", fullpath1, entry->d_name) < 0) { + return; + } if (asprintf(&newpath, "%s/%s", path, entry->d_name) >= 0) { struct stat sb; stat(fullpath2, &sb);