diff options
| author | Karel Zak | 2014-12-04 11:41:51 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-12-04 11:41:51 +0100 |
| commit | 0073a4cff2ef7670e4f657b1a6eaf519997edddc (patch) | |
| tree | 9566a3654882bfdb79a0ead22d9500a72f71c028 /disk-utils/fdisk.c | |
| parent | libfdisk: fix cfdisk freespace analyze (diff) | |
| download | kernel-qcow2-util-linux-0073a4cff2ef7670e4f657b1a6eaf519997edddc.tar.gz kernel-qcow2-util-linux-0073a4cff2ef7670e4f657b1a6eaf519997edddc.tar.xz kernel-qcow2-util-linux-0073a4cff2ef7670e4f657b1a6eaf519997edddc.zip | |
libfdisk: rename sector_t to fdisk_sector_t
.. just to avoid too generic names for public API.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/fdisk.c')
| -rw-r--r-- | disk-utils/fdisk.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index 8a66caeed..cf86281bb 100644 --- a/disk-utils/fdisk.c +++ b/disk-utils/fdisk.c @@ -613,14 +613,14 @@ void dump_disklabel(struct fdisk_context *cxt) dump_blkdev(cxt, name, offset, size, all); } -static sector_t get_dev_blocks(char *dev) +static fdisk_sector_t get_dev_blocks(char *dev) { int fd, ret; - sector_t size; + fdisk_sector_t size; if ((fd = open(dev, O_RDONLY)) < 0) err(EXIT_FAILURE, _("cannot open %s"), dev); - ret = blkdev_get_sectors(fd, &size); + ret = blkdev_get_sectors(fd, (unsigned long long *) &size); close(fd); if (ret < 0) err(EXIT_FAILURE, _("BLKGETSIZE ioctl failed on %s"), dev); @@ -823,10 +823,12 @@ int main(int argc, char **argv) usage(stderr); for (i = optind; i < argc; i++) { + uintmax_t blks = get_dev_blocks(argv[i]); + if (argc - optind == 1) - printf("%llu\n", get_dev_blocks(argv[i])); + printf("%ju\n", blks); else - printf("%s: %llu\n", argv[i], get_dev_blocks(argv[i])); + printf("%s: %ju\n", argv[i], blks); } break; |