aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2017-05-23 06:04:38 +0000
committerEnji Cooper <ngie@FreeBSD.org>2017-05-23 06:04:38 +0000
commitd547c56fdf754d25263c5cb965a8bbcb8b2a7025 (patch)
tree3b69374ad7333b3060aef4284cc379836dda17ec /usr.sbin
parente08d8565f117ae1cfad7e1514037dbb824b1ce04 (diff)
downloadsrc-d547c56fdf754d25263c5cb965a8bbcb8b2a7025.tar.gz
src-d547c56fdf754d25263c5cb965a8bbcb8b2a7025.zip
Some minor style(9) fixes
- Wrap at <80 columns. - Sort by type MFC after: 2 weeks Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=318693
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bsdinstall/partedit/part_wizard.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
index 4ac7603b7416..5df6730b4387 100644
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -47,11 +47,12 @@ static char *boot_disk(struct gmesh *mesh);
static char *wizard_partition(struct gmesh *mesh, const char *disk);
int
-part_wizard(const char *fsreq) {
- int error;
- struct gmesh mesh;
+part_wizard(const char *fsreq)
+{
char *disk, *schemeroot;
const char *fstype;
+ struct gmesh mesh;
+ int error;
if (fsreq != NULL)
fstype = fsreq;
@@ -199,9 +200,9 @@ wizard_partition(struct gmesh *mesh, const char *disk)
struct gclass *classp;
struct ggeom *gpart = NULL;
struct gconfig *gc;
- char message[512];
- const char *scheme = NULL;
char *retval = NULL;
+ const char *scheme = NULL;
+ char message[512];
int choice;
LIST_FOREACH(classp, &mesh->lg_class, lg_class)
@@ -295,15 +296,17 @@ query:
}
int
-wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, int interactive)
+wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype,
+ int interactive)
{
- struct gmesh submesh;
struct gclass *classp;
struct ggeom *gp;
struct gprovider *pp;
- intmax_t swapsize, available;
- char swapsizestr[10], rootsizestr[10], *fsname;
char *fsnames[] = {"freebsd-ufs", "freebsd-zfs"};
+ char *fsname;
+ struct gmesh submesh;
+ char swapsizestr[10], rootsizestr[10];
+ intmax_t swapsize, available;
int retval;
if (strcmp(fstype, "zfs") == 0) {
@@ -362,4 +365,3 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, int i
return (0);
}
-