fdisk: rename cxt->mbr buffer to cxt->firstsector

MBR is regular name for DOS partition table, let use less confusing
name for the buffer.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index e1d5fa6f59ba412d8db4f304d588f6a6b27571a1..010431d2740fbe06ae7cb859d09ea0ada3149d21 100644 (file)
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -1521,7 +1521,7 @@ static void print_raw(struct fdisk_context *cxt)
 
        printf(_("Device: %s\n"), cxt->dev_path);
        if (disklabel == SUN_LABEL || disklabel == SGI_LABEL)
-               print_buffer(cxt, cxt->mbr);
+               print_buffer(cxt, cxt->firstsector);
        else for (i = 3; i < partitions; i++)
                     print_buffer(cxt, ptes[i].sectorbuffer);
 }

diff --git a/fdisks/fdisk.h b/fdisks/fdisk.h
index 6288a131c38122599766025087fe5fa210a637ab..713b599bb2d52b4a6747535fa1012fabc211799b 100644 (file)
--- a/fdisks/fdisk.h
+++ b/fdisks/fdisk.h
@@ -111,7 +111,7 @@ struct fdisk_geometry {
 struct fdisk_context {
        int dev_fd;         /* device descriptor */
        char *dev_path;     /* device path */
-       unsigned char *mbr; /* buffer with master boot record */
+       unsigned char *firstsector; /* buffer with master boot record */
 
        /* topology */
        unsigned long io_size;          /* I/O size used by fdisk */
@@ -149,7 +149,7 @@ extern int fdisk_dev_has_topology(struct fdisk_context *cxt);
 extern int fdisk_dev_has_disklabel(struct fdisk_context *cxt);
 extern int fdisk_dev_sectsz_is_default(struct fdisk_context *cxt);
 extern void fdisk_free_context(struct fdisk_context *cxt);
-extern void fdisk_mbr_zeroize(struct fdisk_context *cxt);
+extern void fdisk_zeroize_firstsector(struct fdisk_context *cxt);
 extern int fdisk_context_force_sector_size(struct fdisk_context *cxt, sector_t s);
 extern int fdisk_context_set_user_geometry(struct fdisk_context *cxt,
                            unsigned int cylinders, unsigned int heads,

diff --git a/fdisks/fdiskaixlabel.c b/fdisks/fdiskaixlabel.c
index ebf9365e8b9deba0a79c4fc52111b96a980ec11f..bdc73e64a0dca8ce3aeb422a5f6225477f6285b8 100644 (file)
--- a/fdisks/fdiskaixlabel.c
+++ b/fdisks/fdiskaixlabel.c
@@ -14,7 +14,7 @@
 #include "fdiskaixlabel.h"
 #include "nls.h"
 
-#define aixlabel ((aix_partition *)cxt->mbr)
+#define aixlabel ((aix_partition *)cxt->firstsector)
 
 static int     other_endian = 0;
 static  short  volumes=1;
@@ -45,7 +45,7 @@ aix_nolabel(struct fdisk_context *cxt)
 {
     aixlabel->magic = 0;
     partitions = 4;
-    fdisk_mbr_zeroize(cxt);
+    fdisk_zeroize_firstsector(cxt);
     return;
 }
 

diff --git a/fdisks/fdiskdoslabel.c b/fdisks/fdiskdoslabel.c
index 1ff0f1d3b9449242543089fbfb6638196058728c..103aa6c6b76b8c370ab580d23d8c56d2c8e50441 100644 (file)
--- a/fdisks/fdiskdoslabel.c
+++ b/fdisks/fdiskdoslabel.c
@@ -119,10 +119,10 @@ void dos_init(struct fdisk_context *cxt)
        for (i = 0; i < 4; i++) {
                struct pte *pe = &ptes[i];
 
-               pe->part_table = pt_offset(cxt->mbr, i);
+               pe->part_table = pt_offset(cxt->firstsector, i);
                pe->ext_pointer = NULL;
                pe->offset = 0;
-               pe->sectorbuffer = cxt->mbr;
+               pe->sectorbuffer = cxt->firstsector;
                pe->changed = 0;
        }
 
@@ -227,7 +227,7 @@ static void read_extended(struct fdisk_context *cxt, int ext)
 
 void dos_print_mbr_id(struct fdisk_context *cxt)
 {
-       printf(_("Disk identifier: 0x%08x\n"), mbr_get_id(cxt->mbr));
+       printf(_("Disk identifier: 0x%08x\n"), mbr_get_id(cxt->firstsector));
 }
 
 int create_doslabel(struct fdisk_context *cxt)
@@ -240,15 +240,15 @@ int create_doslabel(struct fdisk_context *cxt)
        fprintf(stderr, _("Building a new DOS disklabel with disk identifier 0x%08x.\n"), id);
 
        dos_init(cxt);
-       fdisk_mbr_zeroize(cxt);
+       fdisk_zeroize_firstsector(cxt);
        set_all_unchanged();
        set_changed(0);
 
        /* Generate an MBR ID for this disk */
-       mbr_set_id(cxt->mbr, id);
+       mbr_set_id(cxt->firstsector, id);
 
        /* Put MBR signature */
-       mbr_set_magic(cxt->mbr);
+       mbr_set_magic(cxt->firstsector);
        return 0;
 }
 
@@ -259,7 +259,7 @@ void dos_set_mbr_id(struct fdisk_context *cxt)
        char ps[64];
 
        snprintf(ps, sizeof ps, _("New disk identifier (current 0x%08x): "),
-                mbr_get_id(cxt->mbr));
+                mbr_get_id(cxt->firstsector));
 
        if (read_chars(ps) == '\n')
                return;
@@ -268,7 +268,7 @@ void dos_set_mbr_id(struct fdisk_context *cxt)
        if (*ep != '\n')
                return;
 
-       mbr_set_id(cxt->mbr, new_id);
+       mbr_set_id(cxt->firstsector, new_id);
        MBRbuffer_changed = 1;
        dos_print_mbr_id(cxt);
 }
@@ -331,7 +331,7 @@ void dos_delete_partition(int i)
 static void get_partition_table_geometry(struct fdisk_context *cxt,
                        unsigned int *ph, unsigned int *ps)
 {
-       unsigned char *bufp = cxt->mbr;
+       unsigned char *bufp = cxt->firstsector;
        struct partition *p;
        int i, h, s, hh, ss;
        int first = 1;
@@ -364,7 +364,7 @@ static int dos_probe_label(struct fdisk_context *cxt)
        int i;
        unsigned int h = 0, s = 0;
 
-       if (!mbr_is_valid_magic(cxt->mbr))
+       if (!mbr_is_valid_magic(cxt->firstsector))
                return 0;
 
        dos_init(cxt);
@@ -717,8 +717,8 @@ void dos_write_table(struct fdisk_context *cxt)
                                MBRbuffer_changed = 1;
        }
        if (MBRbuffer_changed) {
-               mbr_set_magic(cxt->mbr);
-               write_sector(cxt, 0, cxt->mbr);
+               mbr_set_magic(cxt->firstsector);
+               write_sector(cxt, 0, cxt->firstsector);
        }
        /* EBR (logical partitions) */
        for (i = 4; i < partitions; i++) {

diff --git a/fdisks/fdiskmaclabel.c b/fdisks/fdiskmaclabel.c
index 555245d88853fcc0ea10d2a99be48aba5b8c658f..9b1b6b2a0bdce513c175485f2de41da5013dda88 100644 (file)
--- a/fdisks/fdiskmaclabel.c
+++ b/fdisks/fdiskmaclabel.c
@@ -43,7 +43,7 @@ mac_nolabel(struct fdisk_context *cxt)
 {
     maclabel->magic = 0;
     partitions = 4;
-    fdisk_mbr_zeroize(cxt);
+    fdisk_zeroize_firstsector(cxt);
     return;
 }
 

diff --git a/fdisks/fdiskmaclabel.h b/fdisks/fdiskmaclabel.h
index 9966849cc7ac9ce05b70271bd2b58b96784ed841..cd1e1bd5f23c6497ec9d685dce71b298cf8c4379 100644 (file)
--- a/fdisks/fdiskmaclabel.h
+++ b/fdisks/fdiskmaclabel.h
@@ -28,7 +28,7 @@ typedef struct {
 #define        MAC_LABEL_MAGIC_3_SWAPPED       0x0000d405
 
 /* fdisk.c */
-#define maclabel ((mac_partition *)cxt->mbr)
+#define maclabel ((mac_partition *)cxt->firstsector)
 
 /* fdiskmaclabel.c */
 extern struct  systypes mac_sys_types[];

diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index 08d6dfd98f099acc98a53ef4ac464a98dfd78a56..6108271e27da31e3c0b5820679ee254a79c15bc9 100644 (file)
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -766,7 +766,7 @@ create_sgilabel(struct fdisk_context *cxt)
         */
        for (i = 0; i < 4; i++) {
                old[i].sysid = 0;
-               if (mbr_is_valid_magic(cxt->mbr)) {
+               if (mbr_is_valid_magic(cxt->firstsector)) {
                        if (get_part_table(i)->sys_ind) {
                                old[i].sysid = get_part_table(i)->sys_ind;
                                old[i].start = get_start_sect(get_part_table(i));
@@ -784,7 +784,7 @@ create_sgilabel(struct fdisk_context *cxt)
                        break;
                }
 
-       fdisk_mbr_zeroize(cxt);
+       fdisk_zeroize_firstsector(cxt);
        sgilabel->magic = SSWAP32(SGI_LABEL_MAGIC);
        sgilabel->boot_part = SSWAP16(0);
        sgilabel->swap_part = SSWAP16(1);

diff --git a/fdisks/fdisksgilabel.h b/fdisks/fdisksgilabel.h
index f6b88e83ca606c2f1294c15c58639b4b114b7e83..571ebbb22a474b58c241fbf8057efaafd2bfcb04 100644 (file)
--- a/fdisks/fdisksgilabel.h
+++ b/fdisks/fdisksgilabel.h
@@ -106,7 +106,7 @@ typedef struct {
 #define SSWAP32(x) (other_endian ? swab32(x) : (uint32_t)(x))
 
 /* fdisk.c */
-#define sgilabel ((sgi_partition *)cxt->mbr)
+#define sgilabel ((sgi_partition *)cxt->firstsector)
 #define sgiparam (sgilabel->devparam)
 
 /* fdisksgilabel.c */

diff --git a/fdisks/fdisksunlabel.c b/fdisks/fdisksunlabel.c
index 6a0c31b15a0b8b31b92b27c4bea093c0a2a0171d..e39b90cca11fe47df296b2d50e476d23172141e3 100644 (file)
--- a/fdisks/fdisksunlabel.c
+++ b/fdisks/fdisksunlabel.c
@@ -160,7 +160,7 @@ int create_sunlabel(struct fdisk_context *cxt)
 #endif
 
        init();
-       fdisk_mbr_zeroize(cxt);
+       fdisk_zeroize_firstsector(cxt);
 
        sunlabel->magic = SSWAP16(SUN_LABEL_MAGIC);
        sunlabel->sanity = SSWAP32(SUN_LABEL_SANE);

diff --git a/fdisks/fdisksunlabel.h b/fdisks/fdisksunlabel.h
index fa12a1d2a78ce17004cdff4762d6de378b165bd9..33689d16023bceeaa2acc7e105346b0114ef2c4e 100644 (file)
--- a/fdisks/fdisksunlabel.h
+++ b/fdisks/fdisksunlabel.h
@@ -73,7 +73,7 @@ struct sun_disk_label {
 
 #define SUN_LABEL_MAGIC                0xDABE
 #define SUN_LABEL_MAGIC_SWAPPED        0xBEDA
-#define sunlabel ((struct sun_disk_label *)cxt->mbr)
+#define sunlabel ((struct sun_disk_label *)cxt->firstsector)
 
 /* fdisksunlabel.c */
 extern struct systypes sun_sys_types[];

diff --git a/fdisks/utils.c b/fdisks/utils.c
index a01b14095109e20a59843234a4ba428f141b6f59..43b813d3f20da247f8f0b271725068adcbab6300 100644 (file)
--- a/fdisks/utils.c
+++ b/fdisks/utils.c
@@ -67,16 +67,16 @@ done:
        return rc;
 }
 
-static int __init_mbr_buffer(struct fdisk_context *cxt)
+static int __init_firstsector_buffer(struct fdisk_context *cxt)
 {
-       DBG(TOPOLOGY, dbgprint("initialize MBR buffer"));
+       DBG(TOPOLOGY, dbgprint("initialize first sector buffer"));
 
-       cxt->mbr = calloc(1, MAX_SECTOR_SIZE);
-       if (!cxt->mbr)
+       cxt->firstsector = calloc(1, MAX_SECTOR_SIZE);
+       if (!cxt->firstsector)
                goto fail;
 
        /* read MBR */
-       if (512 != read(cxt->dev_fd, cxt->mbr, 512)) {
+       if (512 != read(cxt->dev_fd, cxt->firstsector, 512)) {
                if (errno == 0)
                        errno = EINVAL; /* probably too small file/device */
                goto fail;
@@ -235,16 +235,16 @@ static int __discover_topology(struct fdisk_context *cxt)
 }
 
 /**
- * fdisk_mbr_zeroize:
+ * fdisk_zeroize_firstsector:
  * @cxt: fdisk context
  *
  * Zero's MBR buffer
  */
-void fdisk_mbr_zeroize(struct fdisk_context *cxt)
+void fdisk_zeroize_firstsector(struct fdisk_context *cxt)
 {
-       if (cxt->mbr) {
-               DBG(CONTEXT, dbgprint("zeroize in-memory MBR"));
-               memset(cxt->mbr, 0, MAX_SECTOR_SIZE);
+       if (cxt->firstsector) {
+               DBG(CONTEXT, dbgprint("zeroize in-memory first sector buffer"));
+               memset(cxt->firstsector, 0, MAX_SECTOR_SIZE);
        }
 }
 
@@ -370,7 +370,7 @@ struct fdisk_context *fdisk_new_context_from_filename(const char *fname, int rea
        if (!cxt->dev_path)
                goto fail;
 
-       if (__init_mbr_buffer(cxt) < 0)
+       if (__init_firstsector_buffer(cxt) < 0)
                goto fail;
 
        __discover_topology(cxt);
@@ -408,6 +408,6 @@ void fdisk_free_context(struct fdisk_context *cxt)
        DBG(CONTEXT, dbgprint("freeing context for %s", cxt->dev_path));
        close(cxt->dev_fd);
        free(cxt->dev_path);
-       free(cxt->mbr);
+       free(cxt->firstsector);
        free(cxt);
 }