marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

document-portal: Fix warnings on 32bit builds 

fi->fh is a uint64, and if we cast that directly to a pointer
on a 32bit arch then we get a warning, so lets first cast
to gsize, and then to pointer.

Should fix https://github.com/flatpak/flatpak/issues/173
tingping/wmclass
Alexander Larsson 2016-11-15 11:32:28 +01:00
parent ca99d5be58
commit bd3eae146a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
document-portal/xdp-fuse.c
View File

@ -1133,7 +1133,7 @@ static void
xdp_fuse_readdir (fuse_req_t req, fuse_ino_t ino, size_t size,
off_t off, struct fuse_file_info *fi)
{
struct dirbuf *b = (struct dirbuf *) (fi->fh);
struct dirbuf *b = (struct dirbuf *) (gsize) (fi->fh);
reply_buf_limited (req, b->p, b->size, off, size);
}
@ -1242,7 +1242,7 @@ xdp_fuse_opendir (fuse_req_t req,
if (fuse_reply_open (req, fi) == -ENOENT)
{
g_free (b.p);
g_free ((gpointer) (fi->fh));
g_free ((gpointer) (gsize) (fi->fh));
}
}
}
@ -1252,7 +1252,7 @@ xdp_fuse_releasedir (fuse_req_t req,
fuse_ino_t ino,
struct fuse_file_info *fi)
{
struct dirbuf *b = (struct dirbuf *) (fi->fh);
struct dirbuf *b = (struct dirbuf *) (gsize) (fi->fh);
g_free (b->p);
g_free (b);
@ -1693,7 +1693,7 @@ xdp_fuse_read (fuse_req_t req,
off_t off,
struct fuse_file_info *fi)
{
XdpFile *file = (gpointer) fi->fh;
XdpFile *file = (gpointer) (gsize) fi->fh;
XdpInode *inode = file->inode;
struct fuse_bufvec bufv = FUSE_BUFVEC_INIT (size);
int fd;
@ -1729,7 +1729,7 @@ xdp_fuse_release (fuse_req_t req,
fuse_ino_t ino,
struct fuse_file_info *fi)
{
XdpFile *file = (gpointer) fi->fh;
XdpFile *file = (gpointer) (gsize) fi->fh;
g_debug ("xdp_fuse_release %lx (fi=%p)", ino, fi);
@ -1895,7 +1895,7 @@ xdp_fuse_write (fuse_req_t req,
off_t off,
struct fuse_file_info *fi)
{
XdpFile *file = (gpointer) fi->fh;
XdpFile *file = (gpointer) (gsize) fi->fh;
XdpInode *inode = file->inode;
int fd;
int res;
@ -1928,7 +1928,7 @@ xdp_fuse_write_buf (fuse_req_t req,
off_t off,
struct fuse_file_info *fi)
{
XdpFile *file = (gpointer) fi->fh;
XdpFile *file = (gpointer) (gsize) fi->fh;
struct fuse_bufvec dst = FUSE_BUFVEC_INIT (fuse_buf_size (bufv));
XdpInode *inode = file->inode;
int fd;