metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Try to fix fuse pointer warnings.

Browse Source
This commit is contained in:
Bojan Smojver 2020-08-31 20:25:25 +10:00
parent eb5d092c15
commit 7f91e143e3
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
xrdp-0.9.14-fuse-pointer.patch Normal file
View File

@ -0,0 +1,39 @@
diff -ruN xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c
--- xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c 2020-06-26 21:13:58.000000000 +1000
+++ xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c 2020-08-31 20:24:21.516983364 +1000
@@ -1607,7 +1607,7 @@
log_error("inode %ld is not valid", ino);
fuse_reply_err(req, ENOENT);
}
- else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL)
+ else if ((dh = (struct xfs_dir_handle *) (unsigned long)fi->fh) == NULL)
{
/* something seriously wrong somewhere! */
fuse_reply_buf(req, 0, 0);
@@ -2095,7 +2095,7 @@
log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
+ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
{
fuse_reply_err(req, EINVAL);
}
@@ -2168,7 +2168,7 @@
log_debug("write %zd bytes at off %lld to inode=%ld",
size, (long long) off, ino);
- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
+ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
{
log_error("file handle fi->fh is NULL");
fuse_reply_err(req, EINVAL);
@@ -2436,7 +2436,7 @@
static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi)
{
- struct xfs_dir_handle *dh = (struct xfs_dir_handle *) fi->fh;
+ struct xfs_dir_handle *dh = (struct xfs_dir_handle *) (unsigned long)fi->fh;
xfs_closedir(g_xfs, dh);
fuse_reply_err(req, 0);
}

1
xrdp.spec
View File

@ -32,6 +32,7 @@ Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch7: xrdp-0.9.14-fuse-pointer.patch
BuildRequires: gcc
BuildRequires: libX11-devel