summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/sgi.c
diff options
context:
space:
mode:
authorKarel Zak2014-12-04 11:41:51 +0100
committerKarel Zak2014-12-04 11:41:51 +0100
commit0073a4cff2ef7670e4f657b1a6eaf519997edddc (patch)
tree9566a3654882bfdb79a0ead22d9500a72f71c028 /libfdisk/src/sgi.c
parentlibfdisk: fix cfdisk freespace analyze (diff)
downloadkernel-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 'libfdisk/src/sgi.c')
-rw-r--r--libfdisk/src/sgi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index ce30f3e61..a646cf390 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -332,7 +332,7 @@ static struct fdisk_parttype *sgi_get_parttype(struct fdisk_context *cxt, size_t
/* fdisk_get_partition() backend */
static int sgi_get_partition(struct fdisk_context *cxt, size_t n, struct fdisk_partition *pa)
{
- uint64_t start, len;
+ fdisk_sector_t start, len;
pa->used = sgi_get_num_sectors(cxt, n) > 0;
if (!pa->used)
@@ -945,11 +945,11 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
#ifdef HDIO_GETGEO
if (cxt->geom.heads && cxt->geom.sectors) {
- sector_t llsectors;
+ fdisk_sector_t llsectors;
- if (blkdev_get_sectors(cxt->dev_fd, &llsectors) == 0) {
+ if (blkdev_get_sectors(cxt->dev_fd, (unsigned long long *) &llsectors) == 0) {
/* the get device size ioctl was successful */
- sector_t llcyls;
+ fdisk_sector_t llcyls;
int sec_fac = cxt->sector_size / 512;
llcyls = llsectors / (cxt->geom.heads * cxt->geom.sectors * sec_fac);