Date: Tue, 18 Jul 2017 18:55:48 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r321168 - stable/11/usr.sbin/bsdinstall/partedit Message-ID: <201707181855.v6IItmNB095553@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue Jul 18 18:55:48 2017 New Revision: 321168 URL: https://svnweb.freebsd.org/changeset/base/321168 Log: MFC r318693,r318694: r318693: Some minor style(9) fixes - Wrap at <80 columns. - Sort by type r318694: style(9): sort headers MFC with: r318693 Modified: stable/11/usr.sbin/bsdinstall/partedit/part_wizard.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bsdinstall/partedit/part_wizard.c ============================================================================== --- stable/11/usr.sbin/bsdinstall/partedit/part_wizard.c Tue Jul 18 18:54:54 2017 (r321167) +++ stable/11/usr.sbin/bsdinstall/partedit/part_wizard.c Tue Jul 18 18:55:48 2017 (r321168) @@ -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, return (0); } -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707181855.v6IItmNB095553>