fdisk: (bsd) *OSF --> *BSD

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

diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c
index 7adf003b7f65580bad5d195870fc7116fed58b99..f78dfe762fec948cbbed4ffc53c5b84c53dd135e 100644 (file)
--- a/fdisks/fdisk-menu.c
+++ b/fdisks/fdisk-menu.c
@@ -91,21 +91,21 @@ struct menu menu_generic = {
                MENU_ENT  ('n', N_("add a new partition")),
                MENU_BENT ('p', N_("print the partition table")),
                MENU_ENT  ('t', N_("change a partition type")),
-               MENU_ENT_E('v', N_("verify the partition table"), FDISK_DISKLABEL_OSF),
+               MENU_ENT_E('v', N_("verify the partition table"), FDISK_DISKLABEL_BSD),
 
                MENU_XENT('d', N_("print the raw data of the first sector")),
 
                MENU_SEP(N_("Misc")),
                MENU_BENT ('m', N_("print this menu")),
                MENU_ENT_E('u', N_("change display/entry units"), FDISK_DISKLABEL_GPT),
-               MENU_ENT_E('x', N_("extra functionality (experts only)"), FDISK_DISKLABEL_OSF),
+               MENU_ENT_E('x', N_("extra functionality (experts only)"), FDISK_DISKLABEL_BSD),
 
                MENU_BSEP(N_("Save & Exit")),
-               MENU_ENT_E('w', N_("write table to disk and exit"), FDISK_DISKLABEL_OSF),
-               MENU_ENT_L('w', N_("write table to disk"), FDISK_DISKLABEL_OSF),
+               MENU_ENT_E('w', N_("write table to disk and exit"), FDISK_DISKLABEL_BSD),
+               MENU_ENT_L('w', N_("write table to disk"), FDISK_DISKLABEL_BSD),
                MENU_BENT ('q', N_("quit without saving changes")),
                MENU_XENT ('r', N_("return to main menu")),
-               MENU_ENT_L('r', N_("return to main menu"), FDISK_DISKLABEL_OSF),
+               MENU_ENT_L('r', N_("return to main menu"), FDISK_DISKLABEL_BSD),
 
                { 0, NULL }
        }
@@ -113,7 +113,7 @@ struct menu menu_generic = {
 
 struct menu menu_createlabel = {
 /*     .callback = createlabel_menu_cb, */
-       .exclude = FDISK_DISKLABEL_OSF,
+       .exclude = FDISK_DISKLABEL_BSD,
        .entries = {
                MENU_SEP(N_("Create a new label")),
                MENU_ENT('g', N_("create a new empty GPT partition table")),
@@ -130,7 +130,7 @@ struct menu menu_createlabel = {
 
 struct menu menu_geo = {
        .callback = geo_menu_cb,
-       .exclude = FDISK_DISKLABEL_GPT | FDISK_DISKLABEL_OSF,
+       .exclude = FDISK_DISKLABEL_GPT | FDISK_DISKLABEL_BSD,
        .entries = {
                MENU_XSEP(N_("Geometry")),
                MENU_XENT('c', N_("change number of cylinders")),
@@ -201,7 +201,7 @@ struct menu menu_dos = {
 
 struct menu menu_bsd = {
        .callback = bsd_menu_cb,
-       .label = FDISK_DISKLABEL_OSF,
+       .label = FDISK_DISKLABEL_BSD,
        .entries = {
                MENU_SEP(N_("BSD")),
                MENU_ENT('e', N_("edit drive data")),
@@ -562,7 +562,7 @@ static int bsd_menu_cb(struct fdisk_context **cxt0,
 
        assert(cxt);
        assert(ent);
-       assert(fdisk_is_disklabel(cxt, OSF));
+       assert(fdisk_is_disklabel(cxt, BSD));
 
        DBG(FRONTEND, dbgprint("enter BSD menu"));
 

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index 34db0a1b1e1346ebf1378d71933ed651e1814a47..36f4361919e99ea4b83b7bbc60814a573c51882d 100644 (file)
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -260,7 +260,7 @@ static void list_table(struct fdisk_context *cxt, int xtra)
 {
        list_disk_geometry(cxt);
 
-       if (fdisk_is_disklabel(cxt, OSF))
+       if (fdisk_is_disklabel(cxt, BSD))
                xbsd_print_disklabel(cxt, xtra);
        else
                fdisk_list_disklabel(cxt);

diff --git a/fdisks/fdiskbsdlabel.c b/fdisks/fdiskbsdlabel.c
index 16473227377a5861538a846ec5bb80cd0bfd5372..28b683a3e1ab71390b1b73f2efec24d1bc41e8a8 100644 (file)
--- a/fdisks/fdiskbsdlabel.c
+++ b/fdisks/fdiskbsdlabel.c
@@ -38,7 +38,7 @@
    19990319 - Arnaldo Carvalho de Melo <acme@conectiva.com.br> - i18n/nls
 
    20000101 - David Huggins-Daines <dhuggins@linuxcare.com> - Better
-   support for OSF/1 disklabels on Alpha.
+   support for BSD/1 disklabels on Alpha.
    Also fixed unaligned accesses in alpha_bootblock_checksum()
 */
 
@@ -147,7 +147,7 @@ static inline struct fdisk_bsd_label *self_label(struct fdisk_context *cxt)
 {
        assert(cxt);
        assert(cxt->label);
-       assert(fdisk_is_disklabel(cxt, OSF));
+       assert(fdisk_is_disklabel(cxt, BSD));
 
        return (struct fdisk_bsd_label *) cxt->label;
 }
@@ -156,7 +156,7 @@ static inline struct bsd_disklabel *self_disklabel(struct fdisk_context *cxt)
 {
        assert(cxt);
        assert(cxt->label);
-       assert(fdisk_is_disklabel(cxt, OSF));
+       assert(fdisk_is_disklabel(cxt, BSD));
 
        return &((struct fdisk_bsd_label *) cxt->label)->bsd;
 }
@@ -1015,7 +1015,7 @@ struct fdisk_label *fdisk_new_bsd_label(struct fdisk_context *cxt)
        /* initialize generic part of the driver */
        lb = (struct fdisk_label *) bsd;
        lb->name = "bsd";
-       lb->id = FDISK_DISKLABEL_OSF;
+       lb->id = FDISK_DISKLABEL_BSD;
        lb->op = &bsd_operations;
        lb->parttypes = xbsd_fstypes;
        lb->nparttypes = ARRAY_SIZE(xbsd_fstypes);

diff --git a/libfdisk/src/libfdisk.h b/libfdisk/src/libfdisk.h
index 875b59938d0a71def466597e7e78c10b365de452..f14cdd14216e4f0b4af7b3805f876c7421b6ba8c 100644 (file)
--- a/libfdisk/src/libfdisk.h
+++ b/libfdisk/src/libfdisk.h
@@ -41,7 +41,7 @@ enum fdisk_labeltype {
        FDISK_DISKLABEL_DOS = (1 << 1),
        FDISK_DISKLABEL_SUN = (1 << 2),
        FDISK_DISKLABEL_SGI = (1 << 3),
-       FDISK_DISKLABEL_OSF = (1 << 4),
+       FDISK_DISKLABEL_BSD = (1 << 4),
        FDISK_DISKLABEL_GPT = (1 << 5)
 };