From: Davidlohr Bueso <dave@gnu.org>
To: Karel Zak <kzak@redhat.com>, Petr Uzel <petr.uzel@suse.cz>
Cc: util-linux <util-linux@vger.kernel.org>
Subject: [PATCH 4/6] fdisk: use BSD label header
Date: Sun, 20 May 2012 18:11:33 +0200 [thread overview]
Message-ID: <1337530293.2677.15.camel@offbook> (raw)
From: Davidlohr Bueso <dave@gnu.org>
Move bsd specific function definitions into its own header file and include it in fdisk code.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
fdisk/fdisk.c | 1 +
fdisk/fdisk.h | 6 ------
fdisk/fdiskbsdlabel.h | 5 +++++
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 08afb45..b6c5758 100644
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -39,6 +39,7 @@
#include "fdiskaixlabel.h"
#include "fdiskmaclabel.h"
#include "fdiskdoslabel.h"
+#include "fdiskbsdlabel.h"
#ifdef HAVE_LINUX_COMPILER_H
#include <linux/compiler.h>
diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 0dafbf8..82888dc 100644
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -185,9 +185,3 @@ static inline int is_cleared_partition(struct partition *p)
p->sys_ind || p->end_head || p->end_sector || p->end_cyl ||
get_start_sect(p) || get_nr_sects(p));
}
-
-/* prototypes for fdiskbsdlabel.c */
-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.h b/fdisk/fdiskbsdlabel.h
index e58e2ff..9bea7cf 100644
--- a/fdisk/fdiskbsdlabel.h
+++ b/fdisk/fdiskbsdlabel.h
@@ -238,4 +238,9 @@ static struct systypes xbsd_fstypes[] = {
#define BSD_D_CHAIN 0x10 /* can do back-back transfers */
#define BSD_D_DOSPART 0x20 /* within MSDOS partition */
+extern void bsd_command_prompt(void);
+extern int check_osf_label(void);
+extern int btrydev(char * dev);
+extern void xbsd_print_disklabel(int);
+
#endif /* FDISK_BSD_LABEL_H */
--
1.7.4.1
reply other threads:[~2012-05-20 16:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1337530293.2677.15.camel@offbook \
--to=dave@gnu.org \
--cc=kzak@redhat.com \
--cc=petr.uzel@suse.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.