fdisk: rename bselect, xselect functions

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
This commit is contained in:
Francesco Cosoleto 2011-11-11 11:12:08 +01:00 committed by Karel Zak
parent 10b7b6439a
commit e97a991aff
3 changed files with 8 additions and 6 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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;