From: Karel Zak Date: Wed, 19 Jun 2013 12:39:40 +0000 (+0200) Subject: fdisk: (dos) remove unnecessary function X-Git-Tag: v2.24-rc1~169 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe71269056c3c02b0b993308cd455b1c6861f1d;p=thirdparty%2Futil-linux.git fdisk: (dos) remove unnecessary function Signed-off-by: Karel Zak --- diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c index 7fea30e73c..644d15bd44 100644 --- a/fdisks/fdiskdoslabel.c +++ b/fdisks/fdiskdoslabel.c @@ -487,9 +487,11 @@ static int dos_probe_label(struct fdisk_context *cxt) if (!mbr_is_valid_magic(pe->sectorbuffer)) { fprintf(stderr, - _("Warning: invalid flag 0x%04x of partition " + _("Warning: invalid flag 0x%02x%02x of partition " "table %zd will be corrected by w(rite)\n"), - pt_entry_flag(pe->sectorbuffer), i + 1); + pe->sectorbuffer[510], + pe->sectorbuffer[511], + i + 1); pe->changed = 1; fdisk_label_set_changed(cxt->label, 1); } diff --git a/fdisks/fdiskdoslabel.h b/fdisks/fdiskdoslabel.h index 6c3210856c..e21b64ad17 100644 --- a/fdisks/fdiskdoslabel.h +++ b/fdisks/fdiskdoslabel.h @@ -27,12 +27,6 @@ extern struct pte ptes[MAXIMUM_PARTS]; extern sector_t extended_offset; -/* A valid partition table sector ends in 0x55 0xaa */ -static inline unsigned int pt_entry_flag(unsigned char *b) -{ - return ((unsigned int) b[510]) + (((unsigned int) b[511]) << 8); -} - static inline int is_cleared_partition(struct dos_partition *p) { return !(!p || p->boot_ind || p->bh || p->bs || p->bc ||