diff options
| author | Karel Zak | 2013-05-30 15:22:41 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-16 16:46:58 +0200 |
| commit | 7e5f8f3824637aeab65f7628aed90c005496832a (patch) | |
| tree | a9902cb183c6b72965305eb07903a1708eda7d1f /libblkid/src/partitions/dos.c | |
| parent | fdisk: (sgi) cleanup devparams flags (diff) | |
| download | kernel-qcow2-util-linux-7e5f8f3824637aeab65f7628aed90c005496832a.tar.gz kernel-qcow2-util-linux-7e5f8f3824637aeab65f7628aed90c005496832a.tar.xz kernel-qcow2-util-linux-7e5f8f3824637aeab65f7628aed90c005496832a.zip | |
libblkid: move MBR partition types to include/
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/partitions/dos.c')
| -rw-r--r-- | libblkid/src/partitions/dos.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index a8c6276a7..9b3991ba9 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -24,19 +24,19 @@ static const struct dos_subtypes { unsigned char type; const struct blkid_idinfo *id; } dos_nested[] = { - { BLKID_FREEBSD_PARTITION, &bsd_pt_idinfo }, - { BLKID_NETBSD_PARTITION, &bsd_pt_idinfo }, - { BLKID_OPENBSD_PARTITION, &bsd_pt_idinfo }, - { BLKID_UNIXWARE_PARTITION, &unixware_pt_idinfo }, - { BLKID_SOLARIS_X86_PARTITION, &solaris_x86_pt_idinfo }, - { BLKID_MINIX_PARTITION, &minix_pt_idinfo } + { MBR_FREEBSD_PARTITION, &bsd_pt_idinfo }, + { MBR_NETBSD_PARTITION, &bsd_pt_idinfo }, + { MBR_OPENBSD_PARTITION, &bsd_pt_idinfo }, + { MBR_UNIXWARE_PARTITION, &unixware_pt_idinfo }, + { MBR_SOLARIS_X86_PARTITION, &solaris_x86_pt_idinfo }, + { MBR_MINIX_PARTITION, &minix_pt_idinfo } }; static inline int is_extended(struct dos_partition *p) { - return (p->sys_type == BLKID_DOS_EXTENDED_PARTITION || - p->sys_type == BLKID_W95_EXTENDED_PARTITION || - p->sys_type == BLKID_LINUX_EXTENDED_PARTITION); + return (p->sys_type == MBR_DOS_EXTENDED_PARTITION || + p->sys_type == MBR_W95_EXTENDED_PARTITION || + p->sys_type == MBR_LINUX_EXTENDED_PARTITION); } static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, @@ -175,7 +175,7 @@ static int probe_dos_pt(blkid_probe pr, * GPT uses valid MBR */ for (p = p0, i = 0; i < 4; i++, p++) { - if (p->sys_type == BLKID_GPT_PARTITION) { + if (p->sys_type == MBR_GPT_PARTITION) { DBG(LOWPROBE, blkid_debug("probably GPT -- ignore")); goto nothing; } |