Merge lp:~colin-king/ecryptfs/ecryptfs-fix-32bit-warnings into lp:ecryptfs

[Colin Ian King]

Fixed some 32 bit build warnings

=== modified file 'src/libecryptfs/ecryptfs-stat.c'
--- src/libecryptfs/ecryptfs-stat.c	2009-02-09 17:29:17 +0000
+++ src/libecryptfs/ecryptfs-stat.c	2013-03-13 15:03:25 +0000
@@ -146,7 +146,7 @@
 	if (buf_size < (ECRYPTFS_FILE_SIZE_BYTES
 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
 			+ 4)) {
-		printf("%s: Invalid metadata size; must have at least [%lu] "
+		printf("%s: Invalid metadata size; must have at least [%zu] "
 		       "bytes; there are only [%zu] bytes\n", __FUNCTION__,
 		       (ECRYPTFS_FILE_SIZE_BYTES
 			+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES
 
=== modified file 'tests/kernel/extend-file-random/test.c'
--- tests/kernel/extend-file-random/test.c	2012-01-31 16:24:09 +0000
+++ tests/kernel/extend-file-random/test.c	2013-03-13 15:03:25 +0000
@@ -48,7 +48,7 @@
 	}
 
 	if (write(fd, buffer, len) != len) {
-		fprintf(stderr, "Failed to write %lu bytes, position %lu: %s\n", 
+		fprintf(stderr, "Failed to write %zu bytes, position %lu: %s\n", 
 			len, offset, strerror(errno));
 		return TEST_FAILED;
 	}
@@ -64,7 +64,7 @@
 	}
 
 	if (read(fd, buffer, len) != len) {
-		fprintf(stderr, "Failed to read %lu bytes, position %lu: %s\n", 
+		fprintf(stderr, "Failed to read %zu bytes, position %lu: %s\n", 
 			len, offset, strerror(errno));
 		return TEST_FAILED;
 	}
 
=== modified file 'tests/kernel/inode-race-stat/test.c'
--- tests/kernel/inode-race-stat/test.c	2012-07-19 17:16:43 +0000
+++ tests/kernel/inode-race-stat/test.c	2013-03-13 15:03:25 +0000
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -122,7 +123,7 @@
 		if (cmd[0] == CMD_TEST) {
 			int ret;
 			off_t sz;
-			sscanf(cmd+1, "%zd", &sz);
+			sscanf(cmd+1, "%jd", (intmax_t *)&sz);
 
 			ret = check_size(filename, sz);
 			switch (ret) {
@@ -307,7 +308,7 @@
 		}
 
 		/* Now tell children to stat the file */
-		snprintf(cmd, sizeof(cmd), "%c%zd", CMD_TEST, sz);
+		snprintf(cmd, sizeof(cmd), "%c%jd", CMD_TEST, (intmax_t)sz);
 		for (i = 0; i < threads; i++) {
 			if (write(pipe_to[i][1], cmd, strlen(cmd)+1) < 0) {
 				fprintf(stderr, "write to pipe failed: %s\n",
 
=== modified file 'tests/kernel/trunc-file/test.c'
--- tests/kernel/trunc-file/test.c	2012-01-31 17:10:46 +0000
+++ tests/kernel/trunc-file/test.c	2013-03-13 15:03:25 +0000
@@ -272,7 +272,7 @@
 
 	len *= 1024;
 	if (len > SSIZE_MAX) {
-		fprintf(stderr, "size should be < %zd\n", SSIZE_MAX / 1024);
+		fprintf(stderr, "size should be < %zd\n", (ssize_t)SSIZE_MAX / 1024);
 		exit(TEST_ERROR);
 	}