nfsdcld: Fix printf format strings on 32bit
diff mbox series

Message ID 20191119230920.10994-1-nazard@nazar.ca
State New
Headers show
Series
  • nfsdcld: Fix printf format strings on 32bit
Related show

Commit Message

Doug Nazar Nov. 19, 2019, 11:09 p.m. UTC
Signed-off-by: Doug Nazar <nazard@nazar.ca>
---
 utils/nfsdcld/nfsdcld.c | 14 +++++++-------
 utils/nfsdcld/sqlite.c  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Steve Dickson Nov. 22, 2019, 3:50 p.m. UTC | #1
On 11/19/19 6:09 PM, Doug Nazar wrote:
> Signed-off-by: Doug Nazar <nazard@nazar.ca>
Committed... (tag: nfs-utils-2-4-3-rc2)

steved.
> ---
>  utils/nfsdcld/nfsdcld.c | 14 +++++++-------
>  utils/nfsdcld/sqlite.c  |  6 +++---
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
> index b064336d..9297df51 100644
> --- a/utils/nfsdcld/nfsdcld.c
> +++ b/utils/nfsdcld/nfsdcld.c
> @@ -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) {
> diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c
> index 23be7971..09518e22 100644
> --- a/utils/nfsdcld/sqlite.c
> +++ b/utils/nfsdcld/sqlite.c
> @@ -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:
>

Patch
diff mbox series

diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
index b064336d..9297df51 100644
--- a/utils/nfsdcld/nfsdcld.c
+++ b/utils/nfsdcld/nfsdcld.c
@@ -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) {
diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c
index 23be7971..09518e22 100644
--- a/utils/nfsdcld/sqlite.c
+++ b/utils/nfsdcld/sqlite.c
@@ -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: