diff options
author | ngie <ngie@FreeBSD.org> | 2017-07-18 18:54:47 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-07-18 18:54:47 +0000 |
commit | 2e1b5393e5b174ec7d49fbbddda7ddf0c3c99901 (patch) | |
tree | 13001719db204bd04b35662f3d0cc6a6e521fff8 | |
parent | fbfb5de3ad8876ff55f4950d7295d7e944ba2171 (diff) | |
download | FreeBSD-src-2e1b5393e5b174ec7d49fbbddda7ddf0c3c99901.zip FreeBSD-src-2e1b5393e5b174ec7d49fbbddda7ddf0c3c99901.tar.gz |
MFC r318693,r318694:
r318693:
Some minor style(9) fixes
- Wrap at <80 columns.
- Sort by type
r318694:
style(9): sort headers
MFC with: r318693
-rw-r--r-- | usr.sbin/bsdinstall/partedit/part_wizard.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index 1e9c899..0724e25 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -27,11 +27,10 @@ */ #include <sys/param.h> +#include <sys/sysctl.h> #include <errno.h> -#include <libutil.h> #include <inttypes.h> - -#include <sys/sysctl.h> +#include <libutil.h> #include <string.h> #include <libgeom.h> @@ -47,11 +46,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 +199,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 +295,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 +364,3 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, int i return (0); } - |