summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/bsd.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/bsd.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/bsd.c')
-rw-r--r--libfdisk/src/bsd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index d355cc0aa..0e45f6dca 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -155,7 +155,7 @@ static int bsd_assign_dos_partition(struct fdisk_context *cxt)
size_t i;
for (i = 0; i < 4; i++) {
- sector_t ss;
+ fdisk_sector_t ss;
l->dos_part = fdisk_dos_get_partition(cxt->parent, i);
@@ -346,10 +346,10 @@ static int bsd_set_partition(struct fdisk_context *cxt, size_t n,
if (l->dos_part && (fdisk_partition_has_start(pa) ||
fdisk_partition_has_size(pa))) {
- sector_t dosbegin = dos_partition_get_start(l->dos_part);
- sector_t dosend = dosbegin + dos_partition_get_size(l->dos_part) - 1;
- sector_t begin = fdisk_partition_has_start(pa) ? pa->start : p->p_offset;
- sector_t end = begin + (fdisk_partition_has_size(pa) ? pa->size : p->p_size) - 1;
+ fdisk_sector_t dosbegin = dos_partition_get_start(l->dos_part);
+ fdisk_sector_t dosend = dosbegin + dos_partition_get_size(l->dos_part) - 1;
+ fdisk_sector_t begin = fdisk_partition_has_start(pa) ? pa->start : p->p_offset;
+ fdisk_sector_t end = begin + (fdisk_partition_has_size(pa) ? pa->size : p->p_size) - 1;
if (begin < dosbegin || begin > dosend)
return -ERANGE;
@@ -609,7 +609,7 @@ int fdisk_bsd_write_bootstrap(struct fdisk_context *cxt)
char buf[BUFSIZ];
char *res, *dp, *p;
int rc;
- sector_t sector;
+ fdisk_sector_t sector;
snprintf(buf, sizeof(buf),
_("Bootstrap: %1$sboot -> boot%1$s (default %1$s)"),