From: Nathan Scott Date: Mon, 26 Mar 2001 07:07:33 +0000 (+0000) Subject: fix warnings when compiled against newer versions of glibc. X-Git-Tag: v1.1.0~1291 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=6bd7ab1da2b4c7d1c984fecf1dc773e4484fcbc4 fix warnings when compiled against newer versions of glibc. --- diff --git a/src/alloc.c b/src/alloc.c index dce16d35..72830a70 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -166,7 +166,7 @@ main(int argc, char **argv) if (!filename) { static char tmpfile[] = "allocXXXXXX"; - mktemp(tmpfile); + mkstemp(tmpfile); filename = malloc(strlen(tmpfile) + strlen(dirname) + 2); sprintf(filename, "%s/%s", dirname, tmpfile); unlinkit = 1; diff --git a/src/lstat64.c b/src/lstat64.c index b8f16315..5fb028c4 100644 --- a/src/lstat64.c +++ b/src/lstat64.c @@ -31,8 +31,8 @@ */ #include +#include #include -#include #include long timebuf; @@ -142,7 +142,7 @@ main(int argc, char **argv) printf(" Gid: (%d)\n", sbuf.st_gid); printf("Device: %2d,%-2d", major(sbuf.st_dev), minor(sbuf.st_dev)); - printf(" Inode: %-10lu", sbuf.st_ino); + printf(" Inode: %-10llu", (unsigned long long)sbuf.st_ino); printf("Links: %-5d", sbuf.st_nlink); if ( ((sbuf.st_mode & S_IFMT) == S_IFCHR) diff --git a/src/nametest.c b/src/nametest.c index 23d837cd..46539981 100644 --- a/src/nametest.c +++ b/src/nametest.c @@ -300,11 +300,9 @@ main(int argc, char *argv[]) retval = unlink(ip->name); if (retval < 0) { if (errno == ENOENT) { - printf("\"%s\"(%lu) not removed, should have existed\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) not removed, should have existed\n", ip->name, (unsigned long long)ip->inumber); } else { - printf("\"%s\"(%lu) on remove: ", - ip->name, ip->inumber); + printf("\"%s\"(%llu) on remove: ", ip->name, (unsigned long long)ip->inumber); perror("unlink"); } } @@ -330,31 +328,33 @@ auto_lookup(struct info *ip) good_looks++; retval = 0; if (ip->exists == 0) { - printf("\"%s\"(%lu) lookup, should not exist\n", - ip->name, statb.st_ino); + printf("\"%s\"(%llu) lookup, should not exist\n", + ip->name, (unsigned long long)statb.st_ino); retval = 1; } else if (ip->inumber != statb.st_ino) { - printf("\"%s\"(%lu) lookup, should be inumber %lu\n", - ip->name, statb.st_ino, ip->inumber); + printf("\"%s\"(%llu) lookup, should be inumber %llu\n", + ip->name, (unsigned long long)statb.st_ino, + (unsigned long long)ip->inumber); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) lookup ok\n", - ip->name, statb.st_ino); + printf("\"%s\"(%llu) lookup ok\n", + ip->name, (unsigned long long)statb.st_ino); } } else if (errno == ENOENT) { bad_looks++; retval = 0; if (ip->exists == 1) { - printf("\"%s\"(%lu) lookup, should exist\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) lookup, should exist\n", + ip->name, (unsigned long long)ip->inumber); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) lookup ENOENT ok\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) lookup ENOENT ok\n", + ip->name, (unsigned long long)ip->inumber); } } else { retval = errno; - printf("\"%s\"(%lu) on lookup: ", ip->name, ip->inumber); + printf("\"%s\"(%llu) on lookup: ", + ip->name, (unsigned long long)ip->inumber); perror("stat64"); } return(retval); @@ -376,12 +376,11 @@ auto_create(struct info *ip) exit(1); } if (ip->exists == 1) { - printf("\"%s\"(%lu) created, but already existed as inumber %lu\n", - ip->name, statb.st_ino, ip->inumber); + printf("\"%s\"(%llu) created, but already existed as inumber %llu\n", ip->name, (unsigned long long)statb.st_ino, (unsigned long long)ip->inumber); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) create new ok\n", - ip->name, statb.st_ino); + printf("\"%s\"(%llu) create new ok\n", + ip->name, (unsigned long long)statb.st_ino); } ip->exists = 1; ip->inumber = statb.st_ino; @@ -393,17 +392,18 @@ auto_create(struct info *ip) perror("stat64"); exit(1); } - printf("\"%s\"(%lu) not created, should not exist\n", - ip->name, statb.st_ino); + printf("\"%s\"(%llu) not created, should not exist\n", + ip->name, (unsigned long long)statb.st_ino); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) not created ok\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) not created ok\n", + ip->name, (unsigned long long)ip->inumber); } ip->exists = 1; } else { retval = errno; - printf("\"%s\"(%lu) on create: ", ip->name, ip->inumber); + printf("\"%s\"(%llu) on create: ", + ip->name, (unsigned long long)ip->inumber); perror("creat"); } return(retval); @@ -419,12 +419,12 @@ auto_remove(struct info *ip) good_rms++; retval = 0; if (ip->exists == 0) { - printf("\"%s\"(%lu) removed, should not have existed\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) removed, should not have existed\n", + ip->name, (unsigned long long)ip->inumber); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) remove ok\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) remove ok\n", + ip->name, (unsigned long long)ip->inumber); } ip->exists = 0; ip->inumber = 0; @@ -432,17 +432,18 @@ auto_remove(struct info *ip) bad_rms++; retval = 0; if (ip->exists == 1) { - printf("\"%s\"(%lu) not removed, should have existed\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) not removed, should have existed\n", + ip->name, (unsigned long long)ip->inumber); retval = 1; } else if (verbose) { - printf("\"%s\"(%lu) not removed ok\n", - ip->name, ip->inumber); + printf("\"%s\"(%llu) not removed ok\n", + ip->name, (unsigned long long)ip->inumber); } ip->exists = 0; } else { retval = errno; - printf("\"%s\"(%lu) on remove: ", ip->name, ip->inumber); + printf("\"%s\"(%llu) on remove: ", + ip->name, (unsigned long long)ip->inumber); perror("unlink"); } return(retval);