Delete unused patches.
This commit is contained in:
parent
f2703fe221
commit
95ab88ec27
@ -1,39 +0,0 @@
|
||||
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,18 +0,0 @@
|
||||
diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
|
||||
--- xrdp-0.9.14-v/common/log.c 2020-08-26 12:32:21.000000000 +1000
|
||||
+++ xrdp-0.9.14/common/log.c 2020-08-31 19:47:18.283542606 +1000
|
||||
@@ -555,9 +555,11 @@
|
||||
now_t = time(&now_t);
|
||||
now = localtime(&now_t);
|
||||
|
||||
- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900,
|
||||
- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min,
|
||||
- now->tm_sec);
|
||||
+ snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ",
|
||||
+ abs((now->tm_year + 1900) % 10000),
|
||||
+ abs((now->tm_mon + 1) % 100), abs(now->tm_mday % 100),
|
||||
+ abs(now->tm_hour % 100), abs(now->tm_min % 100),
|
||||
+ abs(now->tm_sec % 100));
|
||||
|
||||
internal_log_lvl2str(lvl, buff + 20);
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -ruN xrdp-0.9.14-v/genkeymap/genkeymap.c xrdp-0.9.14/genkeymap/genkeymap.c
|
||||
--- xrdp-0.9.14-v/genkeymap/genkeymap.c 2020-08-26 12:32:21.000000000 +1000
|
||||
+++ xrdp-0.9.14/genkeymap/genkeymap.c 2020-08-31 19:55:04.773214339 +1000
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <X11/XKBlib.h>
|
||||
#include <locale.h>
|
||||
|
||||
-extern int xfree86_to_evdev[137-8];
|
||||
+extern int xfree86_to_evdev[137-8+1];
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
Loading…
Reference in New Issue
Block a user