fdisk: rename bselect, xselect functions

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 249de71011e060b15974e2a0f1ad3a0f30a88a04..9b12bbe1651597e3064bf4895e5903178aa7d711 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2735,7 +2735,8 @@ move_begin(int i) {
 }
 
 static void
-xselect(void) {
+expert_command_prompt(void)
+{
        char c;
 
        while(1) {
@@ -3084,7 +3085,7 @@ main(int argc, char **argv) {
                printf(_("Detected an OSF/1 disklabel on %s, entering "
                         "disklabel mode.\n"),
                       disk_device);
-               bselect();
+               bsd_command_prompt();
                /* If we return we may want to make an empty DOS label? */
                disklabel = DOS_LABEL;
        }
@@ -3119,7 +3120,7 @@ main(int argc, char **argv) {
                                else
                                        sgi_set_bootfile(line_ptr);
                        } else
-                               bselect();
+                               bsd_command_prompt();
                        break;
                case 'c':
                        if (disklabel == DOS_LABEL)
@@ -3191,7 +3192,7 @@ main(int argc, char **argv) {
                                        _("\n\tSorry, no experts menu for SGI "
                                        "partition tables available.\n\n"));
                        } else
-                               xselect();
+                               expert_command_prompt();
                        break;
                default:
                        unknown_command(c);

diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index e2890439f4b5d5017e9e8206ee2faaa884a228f4..0bc1289c2033e9b3af37f18efab78eb67040f455 100644 (file)
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -107,7 +107,7 @@ enum labeltype {
 extern enum labeltype disklabel;
 
 /* prototypes for fdiskbsdlabel.c */
-extern void bselect(void);
+extern void bsd_command_prompt(void);
 extern int check_osf_label(void);
 extern int btrydev(char * dev);
 extern void xbsd_print_disklabel(int);

diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c
index aa27bad76c5595f639cfb138bfbc6aa4d617f724..68d481c1a7d7ed6ac095a60637816597e8c29f4f 100644 (file)
--- a/fdisk/fdiskbsdlabel.c
+++ b/fdisk/fdiskbsdlabel.c
@@ -160,7 +160,8 @@ is_bsd_partition_type(int type) {
 #endif
 
 void
-bselect (void) {
+bsd_command_prompt (void)
+{
 #if !defined (__alpha__)
   int t, ss;
   struct partition *p;