[PATCH 2/5] fdisk: rename bselect, xselect functions

[Francesco Cosoleto <cosoleto@xxxxxxxxx>]

Signed-off-by: Francesco Cosoleto <cosoleto@xxxxxxxxx>
---
 fdisk/fdisk.c         |    9 +++++----
 fdisk/fdisk.h         |    2 +-
 fdisk/fdiskbsdlabel.c |    3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 135d118..7d1bd19 100644
--- 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) {
@@ -3089,7 +3090,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;
 	}
@@ -3120,7 +3121,7 @@ main(int argc, char **argv) {
 				else
 					sgi_set_bootfile(line_ptr);
 			} else
-				bselect();
+				bsd_command_prompt();
 			break;
 		case 'c':
 			if (disklabel == DOS_LABEL)
@@ -3192,7 +3193,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 e289043..0bc1289 100644
--- 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 aa27bad..68d481c 100644
--- 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;
-- 
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html