jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1682 from aquesnel/issue1678

Browse Source 
Fix warnings in chansrv_fuse.c on 32-bit platforms
This commit is contained in:
matt335672 2020-09-09 09:51:24 +01:00 committed by GitHub
commit 60a2beb435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -82,17 +82,17 @@ max_x86_deps: &max_x86_deps
- libxrandr-dev:i386 - libxrandr-dev:i386
- libxrender-dev:i386 - libxrender-dev:i386
- openssl:i386 - openssl:i386
- libfuse-dev:i386
# No --enable-pixman to allow testing the replacement code # No --enable-pixman to allow testing the replacement code
# No --enable-fuse due to failing libfuse-dev:i386 package install
max_x86_conf: &max_x86_conf max_x86_conf: &max_x86_conf
env: env:
- CONF_FLAGS="--enable-ipv6 --enable-jpeg --disable-fuse --enable-mp3lame - CONF_FLAGS="--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
--enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
--disable-pixman --host=i686-linux" --disable-pixman --host=i686-linux"
- PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig - PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- CFLAGS=-m32 - CFLAGS="-m32"
- LDFLAGS=-m32 - LDFLAGS="-m32"
addons: addons:
apt: apt:
packages: packages:
@ -154,5 +154,5 @@ matrix:
script: script:
- ./bootstrap - ./bootstrap
- ./configure $CONF_FLAGS - ./configure $CONF_FLAGS
- make CFLAGS="$CFLAGS" - make
- test -z "$DISTCHECK" || make distcheck - test -z "$DISTCHECK" || make distcheck

3
configure.ac
View File

@ -406,6 +406,9 @@ echo " exec_prefix $exec_prefix"
echo " libdir $libdir" echo " libdir $libdir"
echo " bindir $bindir" echo " bindir $bindir"
echo " sysconfdir $sysconfdir" echo " sysconfdir $sysconfdir"
echo ""
echo " CFLAGS = $CFLAGS"
echo " LDFLAGS = $LDFLAGS"
# xrdp_configure_options.h will be written to the build directory, not the source directory # xrdp_configure_options.h will be written to the build directory, not the source directory
echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h

8
sesman/chansrv/chansrv_fuse.c
View File

@ -1607,7 +1607,7 @@ static void xfuse_cb_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
log_error("inode %ld is not valid", ino); log_error("inode %ld is not valid", ino);
fuse_reply_err(req, ENOENT); fuse_reply_err(req, ENOENT);
} }
else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL) else if ((dh = (struct xfs_dir_handle *) (tintptr) fi->fh) == NULL)
{ {
/* something seriously wrong somewhere! */ /* something seriously wrong somewhere! */
fuse_reply_buf(req, 0, 0); fuse_reply_buf(req, 0, 0);
@ -2095,7 +2095,7 @@ static void xfuse_cb_read(fuse_req_t req, fuse_ino_t ino, size_t size,
log_debug("want_bytes %zd bytes at off %lld", size, (long long) off); log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL) if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
{ {
fuse_reply_err(req, EINVAL); fuse_reply_err(req, EINVAL);
} }
@ -2168,7 +2168,7 @@ static void xfuse_cb_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
log_debug("write %zd bytes at off %lld to inode=%ld", log_debug("write %zd bytes at off %lld to inode=%ld",
size, (long long) off, ino); size, (long long) off, ino);
if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL) if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
{ {
log_error("file handle fi->fh is NULL"); log_error("file handle fi->fh is NULL");
fuse_reply_err(req, EINVAL); fuse_reply_err(req, EINVAL);
@ -2436,7 +2436,7 @@ static void xfuse_cb_opendir(fuse_req_t req, fuse_ino_t ino,
static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino, static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi) 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 *) (tintptr) fi->fh;
xfs_closedir(g_xfs, dh); xfs_closedir(g_xfs, dh);
fuse_reply_err(req, 0); fuse_reply_err(req, 0);
} }