[packages/nfs-utils.git] / nfs-utils-types.patch

--- nfs-utils-2.3.4/utils/nfsdcld/sqlite.c.orig	2019-05-10 21:09:49.000000000 +0200
+++ nfs-utils-2.3.4/utils/nfsdcld/sqlite.c	2019-06-01 21:18:49.456790606 +0200
@@ -55,7 +55,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <stdint.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <sqlite3.h>
 #include <linux/limits.h>
@@ -535,7 +535,7 @@
 		xlog(L_ERROR, "Unable to begin transaction: %s", err);
 		goto rollback;
 	}
-	ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
+	ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
 			current_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
@@ -550,7 +550,7 @@
 		xlog(L_ERROR, "Unable to clear records from current epoch: %s", err);
 		goto rollback;
 	}
-	ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" "
+	ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016"PRIx64"\" "
 				"SELECT id FROM attached.clients;",
 				current_epoch);
 	if (ret < 0) {
@@ -703,7 +703,7 @@
 	int ret;
 	sqlite3_stmt *stmt = NULL;
 
-	ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" "
+	ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016"PRIx64"\" "
 				"VALUES (?);", current_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
@@ -748,7 +748,7 @@
 	int ret;
 	sqlite3_stmt *stmt = NULL;
 
-	ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" "
+	ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\" "
 				"WHERE id==?;", current_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
@@ -798,7 +798,7 @@
 	int ret;
 	sqlite3_stmt *stmt = NULL;
 
-	ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM  \"rec-%016lx\" "
+	ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM  \"rec-%016"PRIx64"\" "
 				"WHERE id==?;", recovery_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
@@ -873,7 +873,7 @@
 		tcur++;
 
 		ret = snprintf(buf, sizeof(buf), "UPDATE grace "
-				"SET current = %ld, recovery = %ld;",
+				"SET current = %"PRId64", recovery = %"PRId64";",
 				(int64_t)tcur, (int64_t)trec);
 		if (ret < 0) {
 			xlog(L_ERROR, "sprintf failed!");
@@ -891,7 +891,7 @@
 			goto rollback;
 		}
 
-		ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" "
+		ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016"PRIx64"\" "
 				"(id BLOB PRIMARY KEY);",
 				tcur);
 		if (ret < 0) {
@@ -915,7 +915,7 @@
 		 * values in the grace table, just clear out the records for
 		 * the current reboot epoch.
 		 */
-		ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
+		ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
 				tcur);
 		if (ret < 0) {
 			xlog(L_ERROR, "sprintf failed!");
@@ -976,7 +976,7 @@
 		goto rollback;
 	}
 
-	ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";",
+	ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016"PRIx64"\";",
 		recovery_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
@@ -1027,7 +1027,7 @@
 		return -EINVAL;
 	}
 
-	ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";",
+	ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016"PRIx64"\";",
 		recovery_epoch);
 	if (ret < 0) {
 		xlog(L_ERROR, "sprintf failed!");
Commit	Line	Data
dc4877f3 JB	1	--- nfs-utils-2.3.4/utils/nfsdcld/sqlite.c.orig 2019-05-10 21:09:49.000000000 +0200
	2	+++ nfs-utils-2.3.4/utils/nfsdcld/sqlite.c 2019-06-01 21:18:49.456790606 +0200
	3	@@ -55,7 +55,7 @@
	4	#include <fcntl.h>
	5	#include <unistd.h>
	6	#include <stdlib.h>
	7	-#include <stdint.h>
	8	+#include <inttypes.h>
	9	#include <limits.h>
	10	#include <sqlite3.h>
	11	#include <linux/limits.h>
	12	@@ -535,7 +535,7 @@
	13	xlog(L_ERROR, "Unable to begin transaction: %s", err);
	14	goto rollback;
	15	}
	16	- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
	17	+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
	18	current_epoch);
	19	if (ret < 0) {
	20	xlog(L_ERROR, "sprintf failed!");
	21	@@ -550,7 +550,7 @@
	22	xlog(L_ERROR, "Unable to clear records from current epoch: %s", err);
	23	goto rollback;
	24	}
	25	- ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016lx\" "
	26	+ ret = snprintf(buf, sizeof(buf), "INSERT INTO \"rec-%016"PRIx64"\" "
	27	"SELECT id FROM attached.clients;",
	28	current_epoch);
	29	if (ret < 0) {
	30	@@ -703,7 +703,7 @@
	31	int ret;
	32	sqlite3_stmt *stmt = NULL;
	33
	34	- ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016lx\" "
	35	+ ret = snprintf(buf, sizeof(buf), "INSERT OR REPLACE INTO \"rec-%016"PRIx64"\" "
	36	"VALUES (?);", current_epoch);
	37	if (ret < 0) {
	38	xlog(L_ERROR, "sprintf failed!");
	39	@@ -748,7 +748,7 @@
	40	int ret;
	41	sqlite3_stmt *stmt = NULL;
	42
	43	- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\" "
	44	+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\" "
	45	"WHERE id==?;", current_epoch);
	46	if (ret < 0) {
	47	xlog(L_ERROR, "sprintf failed!");
	48	@@ -798,7 +798,7 @@
	49	int ret;
	50	sqlite3_stmt *stmt = NULL;
	51
	52	- ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016lx\" "
	53	+ ret = snprintf(buf, sizeof(buf), "SELECT count(*) FROM \"rec-%016"PRIx64"\" "
	54	"WHERE id==?;", recovery_epoch);
	55	if (ret < 0) {
	56	xlog(L_ERROR, "sprintf failed!");
	57	@@ -873,7 +873,7 @@
	58	tcur++;
	59
	60	ret = snprintf(buf, sizeof(buf), "UPDATE grace "
	61	- "SET current = %ld, recovery = %ld;",
	62	+ "SET current = %"PRId64", recovery = %"PRId64";",
	63	(int64_t)tcur, (int64_t)trec);
	64	if (ret < 0) {
65	xlog(L_ERROR, "sprintf failed!");
66	@@ -891,7 +891,7 @@
67	goto rollback;
68	}
69
70	- ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016lx\" "
71	+ ret = snprintf(buf, sizeof(buf), "CREATE TABLE \"rec-%016"PRIx64"\" "
72	"(id BLOB PRIMARY KEY);",
73	tcur);
74	if (ret < 0) {
75	@@ -915,7 +915,7 @@
76	* values in the grace table, just clear out the records for
77	* the current reboot epoch.
78	*/
79	- ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016lx\";",
80	+ ret = snprintf(buf, sizeof(buf), "DELETE FROM \"rec-%016"PRIx64"\";",
81	tcur);
82	if (ret < 0) {
83	xlog(L_ERROR, "sprintf failed!");
84	@@ -976,7 +976,7 @@
85	goto rollback;
86	}
87
88	- ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016lx\";",
89	+ ret = snprintf(buf, sizeof(buf), "DROP TABLE \"rec-%016"PRIx64"\";",
90	recovery_epoch);
91	if (ret < 0) {
92	xlog(L_ERROR, "sprintf failed!");
93	@@ -1027,7 +1027,7 @@
94	return -EINVAL;
95	}
96
97	- ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016lx\";",
98	+ ret = snprintf(buf, sizeof(buf), "SELECT * FROM \"rec-%016"PRIx64"\";",
99	recovery_epoch);
100	if (ret < 0) {
101	xlog(L_ERROR, "sprintf failed!");