diff options
| author | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2013-05-05 19:38:32 -0700 |
|---|---|---|
| committer | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2013-05-05 19:38:32 -0700 |
| commit | ca61050b74665bf282cecf6a71e2991c8ac4d0e5 (patch) | |
| tree | 6626edfd479eebcb2a4ed94c1fcde160d259c2a1 /sesman/chansrv/chansrv_fuse.c | |
| parent | 771e2248b25fdb9acc5471dc7bdcaad607928675 (diff) | |
| parent | 2086cc25e7af16a2d4f7ad8ff8007568ad8b7484 (diff) | |
| download | xrdp-proprietary-ca61050b74665bf282cecf6a71e2991c8ac4d0e5.tar.gz xrdp-proprietary-ca61050b74665bf282cecf6a71e2991c8ac4d0e5.zip | |
file system redirection: resolved merge conflicts
Diffstat (limited to 'sesman/chansrv/chansrv_fuse.c')
| -rw-r--r-- | sesman/chansrv/chansrv_fuse.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c index 7ae15e49..0d762d6a 100644 --- a/sesman/chansrv/chansrv_fuse.c +++ b/sesman/chansrv/chansrv_fuse.c @@ -1619,7 +1619,7 @@ done: #endif if (!fip) - log_error("fip is NULL"); + printf("###### %s : %s : %d: fip is NULL\n", __FILE__, __func__, __LINE__); if (fip) free(fip); @@ -1826,14 +1826,10 @@ void xfuse_devredir_cb_write_file(void *vp, char *buf, size_t length) XRDP_INODE *xinode; XFUSE_INFO *fip; - log_debug("entered: length=%lld", (long long) length); - fip = (XFUSE_INFO *) vp; if (fip == NULL) return; - log_debug("letting FUSE know that we wrote %lld bytes", (long long) length); - fuse_reply_write(fip->req, length); /* update file size */ @@ -1893,7 +1889,6 @@ void xfuse_devredir_cb_rename_file(void *vp, tui32 IoStatus) if (IoStatus != 0) { - log_debug("rename failed with IoStatus=0x%x", IoStatus); fuse_reply_err(fip->req, EEXIST); free(fip); return; @@ -1920,7 +1915,6 @@ void xfuse_devredir_cb_rename_file(void *vp, tui32 IoStatus) old_xinode = xfuse_get_inode_from_pinode_name(fip->inode, fip->name); if (old_xinode == NULL) { - log_debug("rename failed"); fuse_reply_err(fip->req, EBADF); free(fip); return; @@ -1960,7 +1954,7 @@ void xfuse_devredir_cb_file_close(void *vp) if ((xinode->nopen == 0) && fip->fi && fip->fi->fh) { - free((char *) fip->fi->fh); + free((char *) (tintptr) (fip->fi->fh)); fip->fi->fh = NULL; } @@ -2680,7 +2674,7 @@ static void xfuse_cb_flush(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) { XFUSE_INFO *fip = NULL; - XFUSE_HANDLE *handle = (XFUSE_HANDLE *) fi->fh; + XFUSE_HANDLE *handle = (XFUSE_HANDLE *) (tintptr) (fi->fh); log_debug("ino=%d", (int) ino); |