Fix the build for rust-lang/rust#8666

Author: MicahChalmer

src/rust_fuse/fuse.rs

@@ -5,6 +5,7 @@ automatically generated by rust-bindgen, with some manual changes needed:
  *  * add Struct_iovec
  *  * add stub Struct_flock
  *  * add derived Zero impl for Struct_fuse_file_info
+ *  * manually change the type of the function pointers, since rust-bindgen hasn't been updated for that yet
 */
 
 use std::libc::*;
@@ -127,37 +128,59 @@ pub struct Struct_fuse_forget_data {
     nlookup: uint64_t,
 }
 pub struct Struct_fuse_lowlevel_ops {
-    init: *u8,
-    destroy: *u8,
-    lookup: *u8,
-    forget: *u8,
-    getattr: *u8,
-    setattr: *u8,
-    readlink: *u8,
-    mknod: *u8,
-    mkdir: *u8,
-    unlink: *u8,
-    rmdir: *u8,
-    symlink: *u8,
-    rename: *u8,
-    link: *u8,
-    open: *u8,
-    read: *u8,
-    write: *u8,
-    flush: *u8,
-    release: *u8,
-    fsync: *u8,
-    opendir: *u8,
-    readdir: *u8,
-    releasedir: *u8,
-    fsyncdir: *u8,
-    statfs: *u8,
-    setxattr: *u8,
-    getxattr: *u8,
-    listxattr: *u8,
-    removexattr: *u8,
-    access: *u8,
-    create: *u8,
+    init: extern "C" fn(userdata:*mut c_void, _conn:*Struct_fuse_conn_info),
+    destroy: extern "C" fn(userdata:*mut c_void),
+    lookup: extern "C" fn(req:fuse_req_t,  parent:fuse_ino_t, name:*c_schar),
+    forget: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, nlookup:c_ulong),
+    getattr: extern "C" fn(req:fuse_req_t, ino: fuse_ino_t,
+                           _fi:*Struct_fuse_file_info),
+    setattr: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, attr:*stat,
+                           to_set: int, fi: *Struct_fuse_file_info),
+    readlink: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t),
+    mknod: extern "C" fn(req:fuse_req_t, parent: fuse_ino_t, name:*c_schar,
+                         mode: mode_t, rdev: dev_t),
+    mkdir: extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar, 
+                         mode:mode_t),
+    unlink: extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar),
+    rmdir: extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar),
+    symlink: extern "C" fn(req: fuse_req_t, link: *c_schar, parent: fuse_ino_t,
+                           name: *c_schar),
+    rename: extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name: *c_schar, newparent: fuse_ino_t,
+                          newname: *c_schar),
+    link: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, newparent: fuse_ino_t,
+                        newname: *c_schar),
+    open: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t,
+                        fi: *Struct_fuse_file_info),
+    read: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t, off: off_t,
+                        fi: *Struct_fuse_file_info),
+    write: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, buf: *u8,
+                         size: size_t, off: off_t, fi: *Struct_fuse_file_info),
+    flush: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t,
+                         fi: *Struct_fuse_file_info),
+    release: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t,
+                           fi: *Struct_fuse_file_info),
+    fsync: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, datasync: c_int,
+                         fi: *Struct_fuse_file_info),
+    opendir: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t,
+                           _fi: *Struct_fuse_file_info),
+    readdir: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t, off: off_t,
+                           fi: *Struct_fuse_file_info),
+    releasedir: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t,
+                              fi: *Struct_fuse_file_info),
+    fsyncdir: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, datasync: c_int,
+                            fi: *Struct_fuse_file_info),
+    statfs: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t),
+    setxattr: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar,
+                            value: *u8, size: size_t, flags: c_int),
+    getxattr: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar,
+                            size: size_t),
+    listxattr: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t),
+    removexattr: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar),
+    access: extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, mask: c_int),
+    create: extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name: *c_schar,
+                          mode: mode_t, fi: *Struct_fuse_file_info),
+
+    // We don't use these yet...
     getlk: *u8,
     setlk: *u8,
     bmap: *u8,

src/rust_fuse/thin.rs

@@ -269,41 +269,40 @@ pub fn fuse_main(args:~[~str], ops:~FuseLowLevelOps) {
     };
 }
 
-
 pub fn make_fuse_ll_oper(ops:&FuseLowLevelOps)
     -> Struct_fuse_lowlevel_ops {
     return Struct_fuse_lowlevel_ops {
-        init: if ops.init_is_implemented() { init_impl } else { ptr::null() },
-        destroy: if ops.destroy_is_implemented() { destroy_impl } else { ptr::null() },
-        lookup: if ops.lookup_is_implemented() { lookup_impl } else { ptr::null() },
-        forget: if ops.forget_is_implemented() { forget_impl } else { ptr::null() },
-        getattr: if ops.getattr_is_implemented() { getattr_impl } else { ptr::null() },
-        setattr: if ops.setattr_is_implemented() { setattr_impl } else { ptr::null() },
-        readlink: if ops.readlink_is_implemented() { readlink_impl } else { ptr::null() },
-        mknod: if ops.mknod_is_implemented() { mknod_impl } else { ptr::null() },
-        mkdir: if ops.mkdir_is_implemented() { mkdir_impl } else { ptr::null() },
-        unlink: if ops.unlink_is_implemented() { unlink_impl } else { ptr::null() },
-        rmdir: if ops.rmdir_is_implemented() { rmdir_impl } else { ptr::null() },
-        symlink: if ops.symlink_is_implemented() { symlink_impl } else { ptr::null() },
-        rename: if ops.rename_is_implemented() { rename_impl } else { ptr::null() },
-        link: if ops.link_is_implemented() { link_impl } else { ptr::null() },
-        open: if ops.open_is_implemented() { open_impl } else { ptr::null() },
-        read: if ops.read_is_implemented() { read_impl } else { ptr::null() },
-        write: if ops.write_is_implemented() { write_impl } else { ptr::null() },
-        flush: if ops.flush_is_implemented() { flush_impl } else { ptr::null() },
-        release: if ops.release_is_implemented() { release_impl } else { ptr::null() },
-        fsync: if ops.fsync_is_implemented() { fsync_impl } else { ptr::null() },
-        opendir: if ops.opendir_is_implemented() { opendir_impl } else { ptr::null() },
-        readdir: if ops.readdir_is_implemented() { readdir_impl } else { ptr::null() },
-        releasedir: if ops.releasedir_is_implemented() { releasedir_impl } else { ptr::null() },
-        fsyncdir: if ops.fsyncdir_is_implemented() { fsyncdir_impl } else { ptr::null() },
-        statfs: if ops.statfs_is_implemented() { statfs_impl } else { ptr::null() },
-        setxattr: if ops.setxattr_is_implemented() { setxattr_impl } else { ptr::null() },
-        getxattr: if ops.getxattr_is_implemented() { getxattr_impl } else { ptr::null() },
-        listxattr: if ops.listxattr_is_implemented() { listxattr_impl } else { ptr::null() },
-        removexattr: if ops.removexattr_is_implemented() { removexattr_impl } else { ptr::null() },
-        access: if ops.access_is_implemented() { access_impl } else { ptr::null() },
-        create: if ops.create_is_implemented() { create_impl } else { ptr::null() },
+        init: if ops.init_is_implemented() { init_impl } else { ptr::null::<c_void>() as extern "C" fn(userdata:*mut c_void, _conn:*Struct_fuse_conn_info) },
+        destroy: if ops.destroy_is_implemented() { destroy_impl } else { ptr::null::<c_void>() as extern "C" fn(userdata:*mut c_void) },
+        lookup: if ops.lookup_is_implemented() { lookup_impl } else { ptr::null::<c_void>() as extern "C" fn(req:fuse_req_t,  parent:fuse_ino_t, name:*c_schar) },
+        forget: if ops.forget_is_implemented() { forget_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, nlookup:c_ulong) },
+        getattr: if ops.getattr_is_implemented() { getattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req:fuse_req_t, ino: fuse_ino_t, _fi:*Struct_fuse_file_info) },
+        setattr: if ops.setattr_is_implemented() { setattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, attr:*stat, to_set: int, fi: *Struct_fuse_file_info) },
+        readlink: if ops.readlink_is_implemented() { readlink_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t) },
+        mknod: if ops.mknod_is_implemented() { mknod_impl } else { ptr::null::<c_void>() as extern "C" fn(req:fuse_req_t, parent: fuse_ino_t, name:*c_schar, mode: mode_t, rdev: dev_t) },
+        mkdir: if ops.mkdir_is_implemented() { mkdir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar,  mode:mode_t) },
+        unlink: if ops.unlink_is_implemented() { unlink_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar) },
+        rmdir: if ops.rmdir_is_implemented() { rmdir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name:*c_schar) },
+        symlink: if ops.symlink_is_implemented() { symlink_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, link: *c_schar, parent: fuse_ino_t, name: *c_schar) },
+        rename: if ops.rename_is_implemented() { rename_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name: *c_schar, newparent: fuse_ino_t, newname: *c_schar) },
+        link: if ops.link_is_implemented() { link_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, newparent: fuse_ino_t, newname: *c_schar) },
+        open: if ops.open_is_implemented() { open_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, fi: *Struct_fuse_file_info) },
+        read: if ops.read_is_implemented() { read_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t, off: off_t, fi: *Struct_fuse_file_info) },
+        write: if ops.write_is_implemented() { write_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, buf: *u8, size: size_t, off: off_t, fi: *Struct_fuse_file_info) },
+        flush: if ops.flush_is_implemented() { flush_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, fi: *Struct_fuse_file_info) },
+        release: if ops.release_is_implemented() { release_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, fi: *Struct_fuse_file_info) },
+        fsync: if ops.fsync_is_implemented() { fsync_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, datasync: c_int, fi: *Struct_fuse_file_info) },
+        opendir: if ops.opendir_is_implemented() { opendir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, _fi: *Struct_fuse_file_info) },
+        readdir: if ops.readdir_is_implemented() { readdir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t, off: off_t, fi: *Struct_fuse_file_info) },
+        releasedir: if ops.releasedir_is_implemented() { releasedir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, fi: *Struct_fuse_file_info) },
+        fsyncdir: if ops.fsyncdir_is_implemented() { fsyncdir_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, datasync: c_int, fi: *Struct_fuse_file_info) },
+        statfs: if ops.statfs_is_implemented() { statfs_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t) },
+        setxattr: if ops.setxattr_is_implemented() { setxattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar, value: *u8, size: size_t, flags: c_int) },
+        getxattr: if ops.getxattr_is_implemented() { getxattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar, size: size_t) },
+        listxattr: if ops.listxattr_is_implemented() { listxattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, size: size_t) },
+        removexattr: if ops.removexattr_is_implemented() { removexattr_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, name: *c_schar) },
+        access: if ops.access_is_implemented() { access_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, ino: fuse_ino_t, mask: c_int) },
+        create: if ops.create_is_implemented() { create_impl } else { ptr::null::<c_void>() as extern "C" fn(req: fuse_req_t, parent: fuse_ino_t, name: *c_schar, mode: mode_t, fi: *Struct_fuse_file_info) },
 
         // Not implemented yet:
         getlk: ptr::null(),