From 12a829dcdc57fb8ddc4887b07b40136288b6e7fe Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 30 May 2006 01:48:51 +0200 Subject: [PATCH] Add a bunch of type fixes for debug/"make check" code paths. Signed-off-by: Matthias Andree --- lib/blkid/dev.c | 8 ++++---- lib/blkid/devno.c | 6 +++--- lib/blkid/probe.c | 8 ++++---- lib/blkid/read.c | 4 ++-- lib/blkid/tag.c | 4 ++-- lib/blkid/tst_types.c | 5 ++++- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c index ea2ccea..770632b 100644 --- a/lib/blkid/dev.c +++ b/lib/blkid/dev.c @@ -68,8 +68,8 @@ void blkid_debug_dump_dev(blkid_dev dev) } printf(" dev: name = %s\n", dev->bid_name); - printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno); - printf(" dev: TIME=\"%ld\"\n", dev->bid_time); + printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno); + printf(" dev: TIME=\"%ld\"\n", (long)dev->bid_time); printf(" dev: PRI=\"%d\"\n", dev->bid_pri); printf(" dev: flags = 0x%08X\n", dev->bid_flags); @@ -196,7 +196,7 @@ extern int optind; void usage(char *prog) { fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask]\n", prog); - fprintf(stderr, "\tList all devices and exit\n", prog); + fprintf(stderr, "\tList all devices and exit\n"); exit(1); } @@ -219,7 +219,7 @@ int main(int argc, char **argv) case 'm': blkid_debug_mask = strtoul (optarg, &tmp, 0); if (*tmp) { - fprintf(stderr, "Invalid debug mask: %d\n", + fprintf(stderr, "Invalid debug mask: %s\n", optarg); exit(1); } diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c index 34fbdf6..bd9fc12 100644 --- a/lib/blkid/devno.c +++ b/lib/blkid/devno.c @@ -125,7 +125,7 @@ static void scan_dir(char *dirname, dev_t devno, struct dir_list **list, else if (S_ISBLK(st.st_mode) && st.st_rdev == devno) { *devname = blkid_strdup(path); DBG(DEBUG_DEVNO, - printf("found 0x%llx at %s (%p)\n", devno, + printf("found 0x%llx at %s (%p)\n", (long long)devno, path, *devname)); break; } @@ -183,7 +183,7 @@ char *blkid_devno_to_devname(dev_t devno) (unsigned long) devno)); } else { DBG(DEBUG_DEVNO, - printf("found devno 0x%04llx as %s\n", devno, devname)); + printf("found devno 0x%04llx as %s\n", (long long)devno, devname)); } @@ -224,7 +224,7 @@ int main(int argc, char** argv) } devno = makedev(major, minor); } - printf("Looking for device 0x%04Lx\n", devno); + printf("Looking for device 0x%04llx\n", (long long)devno); devname = blkid_devno_to_devname(devno); if (devname) free(devname); diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 17f71d0..e7fdc9c 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -224,7 +224,7 @@ static char *no_name = "NO NAME "; static unsigned char *search_fat_label(struct vfat_dir_entry *dir, int count) { - unsigned int i; + int i; for (i = 0; i < count; i++) { if (dir[i].name[0] == 0x00) @@ -764,8 +764,8 @@ blkid_dev blkid_verify(blkid_cache cache, blkid_dev dev) return dev; DBG(DEBUG_PROBE, - printf("need to revalidate %s (time since last check %lu)\n", - dev->bid_name, diff)); + printf("need to revalidate %s (time since last check %llu)\n", + dev->bid_name, (unsigned long long)diff)); if (((probe.fd = open(dev->bid_name, O_RDONLY)) < 0) || (fstat(probe.fd, &st) < 0)) { @@ -852,7 +852,7 @@ found_type: blkid_set_tag(dev, "TYPE", type, 0); DBG(DEBUG_PROBE, printf("%s: devno 0x%04llx, type %s\n", - dev->bid_name, st.st_rdev, type)); + dev->bid_name, (long long)st.st_rdev, type)); } if (probe.sbbuf) diff --git a/lib/blkid/read.c b/lib/blkid/read.c index 010d9f3..7a147f6 100644 --- a/lib/blkid/read.c +++ b/lib/blkid/read.c @@ -452,8 +452,8 @@ static void debug_dump_dev(blkid_dev dev) } printf(" dev: name = %s\n", dev->bid_name); - printf(" dev: DEVNO=\"0x%0llx\"\n", dev->bid_devno); - printf(" dev: TIME=\"%ld\"\n", dev->bid_time); + printf(" dev: DEVNO=\"0x%0llx\"\n", (long long)dev->bid_devno); + printf(" dev: TIME=\"%lld\"\n", (long long)dev->bid_time); printf(" dev: PRI=\"%d\"\n", dev->bid_pri); printf(" dev: flags = 0x%08X\n", dev->bid_flags); diff --git a/lib/blkid/tag.c b/lib/blkid/tag.c index b6539a8..a3c13b8 100644 --- a/lib/blkid/tag.c +++ b/lib/blkid/tag.c @@ -386,7 +386,7 @@ void usage(char *prog) fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " "[type value]\n", prog); - fprintf(stderr, "\tList all tags for a device and exit\n", prog); + fprintf(stderr, "\tList all tags for a device and exit\n"); exit(1); } @@ -412,7 +412,7 @@ int main(int argc, char **argv) case 'm': blkid_debug_mask = strtoul (optarg, &tmp, 0); if (*tmp) { - fprintf(stderr, "Invalid debug mask: %d\n", + fprintf(stderr, "Invalid debug mask: %s\n", optarg); exit(1); } diff --git a/lib/blkid/tst_types.c b/lib/blkid/tst_types.c index 53cfc81..7dadb1d 100644 --- a/lib/blkid/tst_types.c +++ b/lib/blkid/tst_types.c @@ -11,7 +11,10 @@ #include "blkid/blkid_types.h" -main(int argc, char **argv) +#include +#include + +int main(int argc, char **argv) { if (sizeof(__u8) != 1) { printf("Sizeof(__u8) is %d should be 1\n", -- 1.8.3.1