Author: ngie
Date: Tue Jul 18 18:54:47 2017
New Revision: 321166
URL: https://svnweb.freebsd.org/changeset/base/321166
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/10/usr.sbin/bsdinstall/partedit/part_wizard.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/bsdinstall/partedit/part_wizard.c
==============================================================================
--- stable/10/usr.sbin/bsdinstall/partedit/part_wizard.c Tue Jul 18
18:51:34 2017 (r321165)
+++ stable/10/usr.sbin/bsdinstall/partedit/part_wizard.c Tue Jul 18
18:54:47 2017 (r321166)
@@ -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);
}
-
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
