diff options
Diffstat (limited to 'user/nfs-utils/ssize_t.patch')
| -rw-r--r-- | user/nfs-utils/ssize_t.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/user/nfs-utils/ssize_t.patch b/user/nfs-utils/ssize_t.patch deleted file mode 100644 index 16313890a..000000000 --- a/user/nfs-utils/ssize_t.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.old 2020-01-24 03:35:27.856939255 +0000 -+++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2020-01-24 04:34:24.349432698 +0000 -@@ -378,7 +378,7 @@ - bsize = cld_message_size(cmsg); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - - /* reopen pipe, just to be sure */ -@@ -409,7 +409,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -459,7 +459,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -498,7 +498,7 @@ - cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -548,7 +548,7 @@ - cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -607,7 +607,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { -@@ -667,7 +667,7 @@ - xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); - wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); - if (wsize != bsize) { -- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", -+ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", - __func__, wsize); - ret = cld_pipe_open(clnt); - if (ret) { ---- nfs-utils-2.4.2/tools/locktest/testlk.c.old 2019-11-13 17:09:41.000000000 +0000 -+++ nfs-utils-2.4.2/tools/locktest/testlk.c 2020-01-24 04:42:06.118844841 +0000 -@@ -5,6 +5,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <unistd.h> -+#include <inttypes.h> - #ifdef linux - #include <getopt.h> - #endif -@@ -81,7 +82,7 @@ - if (fl.l_type == F_UNLCK) { - printf("%s: no conflicting lock\n", fname); - } else { -- printf("%s: conflicting lock by %d on (%ld;%ld)\n", -+ printf("%s: conflicting lock by %d on (%"PRId64";%"PRId64")\n", - fname, fl.l_pid, fl.l_start, fl.l_len); - } - return 0; |