From: Francesco Cosoleto <cosoleto@gmail.com>
To: util-linux@vger.kernel.org
Cc: Francesco Cosoleto <cosoleto@gmail.com>
Subject: [PATCH 2/5] fdisk: rename bselect, xselect functions
Date: Fri, 11 Nov 2011 11:12:08 +0100 [thread overview]
Message-ID: <1321006331-7633-2-git-send-email-cosoleto@gmail.com> (raw)
In-Reply-To: <1321006331-7633-1-git-send-email-cosoleto@gmail.com>
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
---
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
next prev parent reply other threads:[~2011-11-11 10:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 10:12 [PATCH 1/5] fdisk: print the welcome message when OSF/1 disklabel is detected Francesco Cosoleto
2011-11-11 10:12 ` Francesco Cosoleto [this message]
2011-11-11 10:12 ` [PATCH 3/5] fdisk: move command prompt code to a separate function Francesco Cosoleto
2011-11-11 10:12 ` [PATCH 4/5] fdisk: rewrite print menu system Francesco Cosoleto
2011-11-11 11:40 ` Karel Zak
2011-11-11 16:49 ` Francesco Cosoleto
2011-11-11 10:12 ` [PATCH 5/5] fdisk: enable expert menu with SGI label Francesco Cosoleto
2011-11-14 13:42 ` [PATCH 1/5] fdisk: print the welcome message when OSF/1 disklabel is detected Karel Zak
2011-11-14 16:03 ` Francesco Cosoleto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321006331-7633-2-git-send-email-cosoleto@gmail.com \
--to=cosoleto@gmail.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).