From owner-svn-src-stable-10@freebsd.org  Sun May 28 00:25:46 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87C48D76928;
 Sun, 28 May 2017 00:25:46 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3EE171301;
 Sun, 28 May 2017 00:25:46 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4S0PjrX090741;
 Sun, 28 May 2017 00:25:45 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4S0Pj7F090739;
 Sun, 28 May 2017 00:25:45 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201705280025.v4S0Pj7F090739@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sun, 28 May 2017 00:25:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r319018 - stable/10/lib/libgeom
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 May 2017 00:25:46 -0000

Author: ngie
Date: Sun May 28 00:25:44 2017
New Revision: 319018
URL: https://svnweb.freebsd.org/changeset/base/319018

Log:
  MFC r317310,r317316:
  
  r317310:
  
  Minor style(9) fixups
  
  Delete trailing whitespace and sort headers.
  
  Leave libgeom.h's placement alone, per reasoning in r317289.
  
  r317316:
  
  Minor style(9) fixups
  
  Delete trailing whitespace and sort headers.
  
  Leave libgeom.h's placement alone, per reasoning in r317289.

Modified:
  stable/10/lib/libgeom/geom_ctl.c
  stable/10/lib/libgeom/geom_stats.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libgeom/geom_ctl.c
==============================================================================
--- stable/10/lib/libgeom/geom_ctl.c	Sun May 28 00:25:41 2017	(r319017)
+++ stable/10/lib/libgeom/geom_ctl.c	Sun May 28 00:25:44 2017	(r319018)
@@ -29,23 +29,22 @@
  * $FreeBSD$
  */
 
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/queue.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <stdint.h>
-#include <sys/types.h>
+#include <paths.h>
 #include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <paths.h>
-
-#include <sys/queue.h>
+#include <string.h>
+#include <unistd.h>
 
 #define GCTL_TABLE 1
 #include <libgeom.h>
 
-/* 
+/*
  * Global pointer to a string that is used to avoid an errorneous free in
  * gctl_free.
  */
@@ -172,7 +171,7 @@ gctl_param_add(struct gctl_req *req, con
 		ap->len = len;
 	else if (len < 0) {
 		ap->flag |= GCTL_PARAM_ASCII;
-		ap->len = strlen(value) + 1;	
+		ap->len = strlen(value) + 1;
 	}
 }
 

Modified: stable/10/lib/libgeom/geom_stats.c
==============================================================================
--- stable/10/lib/libgeom/geom_stats.c	Sun May 28 00:25:41 2017	(r319017)
+++ stable/10/lib/libgeom/geom_stats.c	Sun May 28 00:25:44 2017	(r319018)
@@ -29,20 +29,18 @@
  * $FreeBSD$
  */
 
-#include <paths.h>
+#include <sys/types.h>
+#include <sys/devicestat.h>
+#include <sys/mman.h>
+#include <sys/time.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <libgeom.h>
 
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/devicestat.h>
-
-
 /************************************************************/
 static uint npages, pagesize, spp;
 static int statsfd = -1;
@@ -67,7 +65,7 @@ geom_stats_resync(void)
 	if (statsfd == -1)
 		return;
 	for (;;) {
-		p = mmap(statp, (npages + 1) * pagesize, 
+		p = mmap(statp, (npages + 1) * pagesize,
 		    PROT_READ, MAP_SHARED, statsfd, 0);
 		if (p == MAP_FAILED)
 			break;