]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
fdisk: (dos) remove unnecessary function
authorKarel Zak <kzak@redhat.com>
Wed, 19 Jun 2013 12:39:40 +0000 (14:39 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 16 Sep 2013 14:47:02 +0000 (16:47 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
fdisks/fdiskdoslabel.c
fdisks/fdiskdoslabel.h

index 7fea30e73ce1f4cd81451032ba11b9b8584b6098..644d15bd4443de3c24a1a72f223f90c405f75cfb 100644 (file)
@@ -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);
                }
index 6c3210856cdf80dc1b5e1af24eee7e00005b382d..e21b64ad17b631f4b2aff463e4678fa9a0af135e 100644 (file)
@@ -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 ||