diff options
| author | Karel Zak | 2013-06-18 15:03:26 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:47:02 +0200 |
| commit | f917738efaa60bd1390482d2959986393cea4737 (patch) | |
| tree | 8a34b741b6c64776197376feb26ea4118a8ad45e /libblkid/src/partitions/dos.c | |
| parent | fdisk: (dos) rename struct partition to dos_partition (diff) | |
| download | kernel-qcow2-util-linux-f917738efaa60bd1390482d2959986393cea4737.tar.gz kernel-qcow2-util-linux-f917738efaa60bd1390482d2959986393cea4737.tar.xz kernel-qcow2-util-linux-f917738efaa60bd1390482d2959986393cea4737.zip | |
libblkid: move MBR definitions to include/pt-mbr.h
Diffstat (limited to 'libblkid/src/partitions/dos.c')
| -rw-r--r-- | libblkid/src/partitions/dos.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index 9b3991ba9..0e0413e64 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -14,7 +14,6 @@ #include <stdint.h> #include "partitions.h" -#include "dos.h" #include "aix.h" /* see superblocks/vfat.c */ @@ -61,7 +60,7 @@ static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, if (!is_valid_mbr_signature(data)) goto leave; - p0 = (struct dos_partition *) (data + BLKID_MSDOS_PT_OFFSET); + p0 = (struct dos_partition *) (data + MBR_PT_OFFSET); /* Usually, the first entry is the real data partition, * the 2nd entry is the next extended partition, or empty, @@ -160,7 +159,7 @@ static int probe_dos_pt(blkid_probe pr, goto nothing; } - p0 = (struct dos_partition *) (data + BLKID_MSDOS_PT_OFFSET); + p0 = (struct dos_partition *) (data + MBR_PT_OFFSET); /* * Reject PT where boot indicator is not 0 or 0x80. @@ -181,8 +180,8 @@ static int probe_dos_pt(blkid_probe pr, } } - blkid_probe_use_wiper(pr, BLKID_MSDOS_PT_OFFSET, - 512 - BLKID_MSDOS_PT_OFFSET); + blkid_probe_use_wiper(pr, MBR_PT_OFFSET, + 512 - MBR_PT_OFFSET); id = dos_parttable_id(data); if (id) @@ -207,7 +206,7 @@ static int probe_dos_pt(blkid_probe pr, ssf = blkid_probe_get_sectorsize(pr) / 512; /* allocate a new partition table */ - tab = blkid_partlist_new_parttable(ls, "dos", BLKID_MSDOS_PT_OFFSET); + tab = blkid_partlist_new_parttable(ls, "dos", MBR_PT_OFFSET); if (!tab) goto err; |