Date: Sun, 28 May 2017 00:25:45 +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-10@freebsd.org Subject: svn commit: r319018 - stable/10/lib/libgeom Message-ID: <201705280025.v4S0Pj7F090739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705280025.v4S0Pj7F090739>