Skip to contentSkip to conversation

nfsdcltrack/sqlite: Fix printf format

PATCH In review Petr Vorel 2 participants 3 messages Jul 22, 2021 – Jul 26, 2021

Subsystems (2)
lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/2 nfsdcltrack/sqlite: Fix printf format

sqlite.c: In function 'sqlite_remove_unreclaimed':
sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]

  547 |  ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
      |                                                                     ~~^
      |                                                                       |
      |                                                                       long int
      |                                                                     %lld
  548 |    grace_start);
      |    ~~~~~~~~~~~
      |    |
      |    time_t {aka long long int}

Found in Buildroot riscv32 build.

---
 utils/nfsdcltrack/sqlite.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
utils/nfsdcltrack/sqlite.c +2 -1
index f79aebb3..cea4a411 100644
@@ -46,6 +46,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <unistd.h>
 #include <sqlite3.h>
 #include <linux/limits.h>
@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start)
 	int ret;
 	char *err = NULL;
 
-	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
+	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64,
 			grace_start);
 	if (ret < 0) {
 		return ret;
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 2/2 nfsdcltrack/nfsdcltrack.c: Fix printf format

nfsdcltrack.c: In function 'cltrack_gracedone':
nfsdcltrack.c:528:47: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]

  528 |  xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
      |                                             ~~^             ~~~~~~~~~
      |                                               |             |
      |                                               long int      time_t {aka long long int}
      |                                             %lld

Found in Buildroot riscv32 build.

---
 utils/nfsdcltrack/nfsdcltrack.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
utils/nfsdcltrack/nfsdcltrack.c +2 -1
index e926f1c0..0b37c094 100644
@@ -33,6 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <sys/inotify.h>
@@ -525,7 +526,7 @@ cltrack_gracedone(const char *timestr)
 	if (*tail)
 		return -EINVAL;
 
-	xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
+	xlog(D_GENERAL, "%s: grace done. gracetime=%"PRIu64, __func__, gracetime);
 
 	ret = sqlite_remove_unreclaimed(gracetime);
 
Signature · 1 line
2.32.0
#2 lore raw
In reply to Petr Vorel
Quoted 12 lines · Petr Vorel

sqlite.c: In function 'sqlite_remove_unreclaimed':
sqlite.c:547:71: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]

   547 |  ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
       |                                                                     ~~^
       |                                                                       |
       |                                                                       long int
       |                                                                     %lld
   548 |    grace_start);
       |    ~~~~~~~~~~~
       |    |
       |    time_t {aka long long int}
Quoted 5 lines

Found in Buildroot riscv32 build.

Both Committed... (tag: nfs-utils-2-5-5-rc1)

steved

Quoted 26 lines
---
  utils/nfsdcltrack/sqlite.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
utils/nfsdcltrack/sqlite.c +2 -1
index f79aebb3..cea4a411 100644
@@ -46,6 +46,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <fcntl.h>
+#include <inttypes.h>
  #include <unistd.h>
  #include <sqlite3.h>
  #include <linux/limits.h>
@@ -544,7 +545,7 @@ sqlite_remove_unreclaimed(time_t grace_start)
  	int ret;
  	char *err = NULL;
 
-	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
+	ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRIu64,
  			grace_start);
  	if (ret < 0) {
  		return ret;