fix compilation with -Werror=format on i586
Subsystems (2)
PATCH 1/1 fix compilation with -Werror=format on i586
From 571884617231dc4bc70caafd69a62c86e2bca445 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <[email protected]>
Date: Thu, 21 Nov 2019 23:58:57 +0100
Subject: [PATCH] fix compilation with -Werror=format on i586
--- support/junction/xml.c | 2 +- tools/locktest/testlk.c | 2 +- utils/nfsdcld/nfsdcld.c | 14 +++++++------- utils/nfsdcld/sqlite.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
support/junction/xml.c +1 -1
@@ -327,7 +327,7 @@ junction_parse_xml_read(const char *pathname, int fd, const char *name,if (retval !=FEDFS_OK )return retval; -xlog (D_CALL ,"%s: XML document contained in junction:\n%ld.%s" , +xlog (D_CALL ,"%s: XML document contained in junction:\n%zu.%s" , __func__, len, (char *)buf); retval =junction_parse_xml_buf (pathname, name, buf, len, doc);
tools/locktest/testlk.c +1 -1
@@ -81,7 +81,7 @@ main(int argc, char **argv)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 (%zd;%zd)\n" , fname, fl.l_pid, fl.l_start, fl.l_len); }return 0 ;
utils/nfsdcld/nfsdcld.c +7 -7
@@ -378,7 +378,7 @@ cld_not_implemented(struct cld_client *clnt) 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 @@ cld_get_version(struct cld_client *clnt)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 @@ reply: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 @@ reply: 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 @@ reply: 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 @@ reply: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 @@ reply: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) {
utils/nfsdcld/sqlite.c +3 -3
@@ -512,7 +512,7 @@ sqlite_startup_query_grace(void) current_epoch = tcur; recovery_epoch = trec; ret =0 ; -xlog (D_GENERAL ,"%s: current_epoch=%lu recovery_epoch=%lu" , +xlog (D_GENERAL ,"%s: current_epoch=%" PRIu64" recovery_epoch=%" PRIu64, __func__, current_epoch, recovery_epoch); out:sqlite3_finalize (stmt);
@@ -1223,7 +1223,7 @@ sqlite_grace_start(void) current_epoch = tcur; recovery_epoch = trec; -xlog (D_GENERAL ,"%s: current_epoch=%lu recovery_epoch=%lu" , +xlog (D_GENERAL ,"%s: current_epoch=%" PRIu64" recovery_epoch=%" PRIu64, __func__, current_epoch, recovery_epoch); out:
@@ -1282,7 +1282,7 @@ sqlite_grace_done(void) } recovery_epoch =0 ; -xlog (D_GENERAL ,"%s: current_epoch=%lu recovery_epoch=%lu" , +xlog (D_GENERAL ,"%s: current_epoch=%" PRIu64" recovery_epoch=%" PRIu64, __func__, current_epoch, recovery_epoch); out:
Signature · 1 line
2.23.0
Hello,
On 11/21/19 5:59 PM, Guillaume Rousse wrote:
A couple things... In the future please in line the patch instead of attaching it and please use the appropriate
Signed-off-by: line
Half of your patch already existed due to commit a20dbec9
The rest of the patch I did Commit (tag: nfs-utils-2-4-3-rc2)
steved.
Le 22/11/2019 à 16:54, Steve Dickson a écrit :
Quoted 11 lines
Hello,
On 11/21/19 5:59 PM, Guillaume Rousse wrote:
A couple things... In the future please in line the patch instead of attaching it and please use the appropriate
Signed-off-by: lineHalf of your patch already existed due to commit
a20dbec9The rest of the patch I did Commit (tag: nfs-utils-2-4-3-rc2)
Sorry for those beginner errors, I'll try to do better next time.
Regards.
Signature · 1 line
Guillaume