Misc cleanup for FreeBSD and clang (#1560)

libfuse/lib/fuse.cpp

@@ -177,48 +177,6 @@ fuse_hdr_arg(const struct fuse_in_header *hdr_)
   return (void*)&hdr_[1];
 }
 
-static
-void
-list_add(struct list_head *new_,
-         struct list_head *prev_,
-         struct list_head *next_)
-{
-  next_->prev = new_;
-  new_->next  = next_;
-  new_->prev  = prev_;
-  prev_->next = new_;
-}
-
-static
-inline
-void
-list_add_head(struct list_head *new_,
-              struct list_head *head_)
-{
-  list_add(new_,head_,head_->next);
-}
-
-static
-inline
-void
-list_add_tail(struct list_head *new_,
-              struct list_head *head_)
-{
-  list_add(new_,head_->prev,head_);
-}
-
-static
-inline
-void
-list_del(struct list_head *entry)
-{
-  struct list_head *prev = entry->prev;
-  struct list_head *next = entry->next;
-
-  next->prev = prev;
-  prev->next = next;
-}
-
 static
 size_t
 id_hash(uint64_t ino)

libfuse/lib/helper.c

@@ -282,7 +282,7 @@ fuse_setup_common(int argc,
   if (res == -1)
     goto err_unmount;
 
-  res = fuse_set_signal_handlers(fuse_get_session(fuse));
+  res = fuse_set_signal_handlers(fuse_get_session());
   if (res == -1)
     goto err_unmount;
 

libfuse/lib/mount_bsd.c

@@ -184,13 +184,16 @@ void fuse_kern_unmount(const char *mountpoint, int fd)
 }
 
 /* Check if kernel is doing init in background */
-static int init_backgrounded(void)
+static
+int
+init_backgrounded(void)
 {
-  unsigned ibg, len;
+  unsigned ibg;
+  size_t len;
 
   len = sizeof(ibg);
 
-  if (sysctlbyname("vfs.fuse.init_backgrounded", &ibg, &len, NULL, 0))
+  if(sysctlbyname("vfs.fuse.init_backgrounded", &ibg, &len, NULL, 0))
     return 0;
 
   return ibg;
@@ -298,10 +301,12 @@ static int fuse_mount_core(const char *mountpoint, const char *opts)
   return fd;
 }
 
-int fuse_kern_mount(const char *mountpoint, struct fuse_args *args)
+int
+fuse_kern_mount(const char       *mountpoint,
+                struct fuse_args *args)
 {
-  struct mount_opts mo;
   int res = -1;
+  struct mount_opts mo;
 
   memset(&mo, 0, sizeof(mo));
   /* mount util should not try to spawn the daemon */
@@ -317,7 +322,6 @@ int fuse_kern_mount(const char *mountpoint, struct fuse_args *args)
     return 0;
 
   res = fuse_mount_core(mountpoint, mo.kernel_opts);
- out:
   free(mo.kernel_opts);
   return res;
 }

libfuse/lib/mount_generic.c

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>