From: Christoph Hellwig <hch@lst.de>
Date: Wed, 31 Dec 2008 11:52:05 +0000 (+0100)
Subject: fix compiler warnings
X-Git-Tag: v1.1.0~332
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=68f67d9c74f76d0280653c6f13468656b893a880

fix compiler warnings

Include all nessecary headers, use the correct format strings and don't
redefine _GNU_SOURCE.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/dmapi/src/suite2/src/mmap.c b/dmapi/src/suite2/src/mmap.c
index 721d0f7c..983fe7de 100644
--- a/dmapi/src/suite2/src/mmap.c
+++ b/dmapi/src/suite2/src/mmap.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <errno.h>
 #include <getopt.h>
+#include <stdlib.h>
 
 
 char * Progname;
diff --git a/src/bulkstat_unlink_test.c b/src/bulkstat_unlink_test.c
index 91631406..17d07c07 100644
--- a/src/bulkstat_unlink_test.c
+++ b/src/bulkstat_unlink_test.c
@@ -164,7 +164,7 @@ main(int argc, char *argv[])
 				for (j=0; j < nfiles; j += stride) {
 					if (ret[i].bs_ino == inodelist[j]) {
 						/* oops ... */
-						printf("failed. Unlinked inode %ld returned by bulkstat\n", inodelist[j]);
+						printf("failed. Unlinked inode %llu returned by bulkstat\n", (unsigned long long)inodelist[j]);
 						exit(1);
 					}
 				}
diff --git a/src/bulkstat_unlink_test_modified.c b/src/bulkstat_unlink_test_modified.c
index 7f1a98af..4acc9129 100644
--- a/src/bulkstat_unlink_test_modified.c
+++ b/src/bulkstat_unlink_test_modified.c
@@ -160,9 +160,10 @@ main(int argc, char *argv[])
 		    if ((ret[i].bs_ino == inodelist[j]) &&
 			(ret[i].bs_gen == genlist[j])) {
 			/* oops, the same inode with old gen number */
-			printf("Unlinked inode %ld with generation %d "
+			printf("Unlinked inode %llu with generation %d "
 			       "returned by bulkstat\n",
-				inodelist[j], genlist[j]);
+				(unsigned long long)inodelist[j],
+				 genlist[j]);
 			exit(1);
 		    }
 		    if ((ret[i].bs_ino == inodelist[j])) {
diff --git a/src/ftrunc.c b/src/ftrunc.c
index 8eeca33c..1587e0d2 100644
--- a/src/ftrunc.c
+++ b/src/ftrunc.c
@@ -21,6 +21,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 int
 main(argc, argv)
diff --git a/src/locktest.c b/src/locktest.c
index fa6ea66c..e35f6a6a 100644
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -797,7 +797,7 @@ main(int argc, char *argv[])
     int		c;
     struct sockaddr_in	myAddr;
     struct linger	noLinger = {1, 0};
-    char	*host;
+    char	*host = NULL;
     char	*endnum;
     int		errflag = 0;
     char	*p;
diff --git a/src/looptest.c b/src/looptest.c
index ab8e41ed..d951f2b8 100755
--- a/src/looptest.c
+++ b/src/looptest.c
@@ -28,8 +28,6 @@
  
 /* dxm - 28/2/2 */
 
-#define _GNU_SOURCE
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <malloc.h>
diff --git a/src/makeextents.c b/src/makeextents.c
index 46893ebd..8183edb1 100644
--- a/src/makeextents.c
+++ b/src/makeextents.c
@@ -119,7 +119,9 @@ main(int argc, char *argv[])
 				return 1;
 			}
 			if (verbose_opt) {
-				printf("truncating back to %lu\n", NUMHOLES_TO_SIZE(num_holes));
+				printf("truncating back to %llu\n",
+				       (unsigned long long)
+					NUMHOLES_TO_SIZE(num_holes));
 			}
 			return 0;
 		}
@@ -128,7 +130,8 @@ main(int argc, char *argv[])
 		curr_holes = 0;
 	}
 	if (curr_holes != 0 && verbose_opt) {
-		printf("creating %lu more holes\n", num_holes - curr_holes);
+		printf("creating %llu more holes\n",
+			(unsigned long long)num_holes - curr_holes);
 	}
 		
 	/* create holes by seeking and writing */
@@ -147,7 +150,8 @@ main(int argc, char *argv[])
 		}
 
 		if (verbose_opt && ((i+1) % status_num == 0)) {
-			printf("seeked and wrote %lu times\n", i+1);
+			printf("seeked and wrote %llu times\n",
+				(unsigned long long)i + 1);
 		}
 	}
 
diff --git a/src/trunc.c b/src/trunc.c
index 854420d7..1a20ef95 100644
--- a/src/trunc.c
+++ b/src/trunc.c
@@ -23,6 +23,8 @@
 #include <errno.h>
 #include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define O_DIRECT	040000
 
@@ -65,10 +67,10 @@ while((c=getopt(argc,argv,"f:"))!=EOF) {
 		}
 	}
 
-	err = posix_memalign(&buf, ALIGNMENT, BUFSIZE);
+	err = posix_memalign((void **)&buf, ALIGNMENT, BUFSIZE);
 	if (err < 0) perror("posix_memalign failed");
 
-	err = posix_memalign(&goodbuf, ALIGNMENT, BUFSIZE);
+	err = posix_memalign((void **)&goodbuf, ALIGNMENT, BUFSIZE);
 	if (err < 0) perror("posix_memalign failed");
 
 	err = unlink(filename);