diff options
author | ngie <ngie@FreeBSD.org> | 2017-05-28 00:25:41 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-05-28 00:25:41 +0000 |
commit | 890cd96dc364cf41ac92d0c457088b89c74dd7d1 (patch) | |
tree | 8d40299e5d502d9000b7c2bfaa4ff857c21eb4d3 /lib/libgeom | |
parent | 7b22440eb5f01e847c821a26b55d371ee16ffd0c (diff) | |
download | FreeBSD-src-890cd96dc364cf41ac92d0c457088b89c74dd7d1.zip FreeBSD-src-890cd96dc364cf41ac92d0c457088b89c74dd7d1.tar.gz |
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.
Diffstat (limited to 'lib/libgeom')
-rw-r--r-- | lib/libgeom/geom_ctl.c | 19 | ||||
-rw-r--r-- | lib/libgeom/geom_stats.c | 14 |
2 files changed, 15 insertions, 18 deletions
diff --git a/lib/libgeom/geom_ctl.c b/lib/libgeom/geom_ctl.c index 956169f..58976a9 100644 --- a/lib/libgeom/geom_ctl.c +++ b/lib/libgeom/geom_ctl.c @@ -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, const char *name, int len, void *value, ap->len = len; else if (len < 0) { ap->flag |= GCTL_PARAM_ASCII; - ap->len = strlen(value) + 1; + ap->len = strlen(value) + 1; } } diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c index 48f7160..539c320 100644 --- a/lib/libgeom/geom_stats.c +++ b/lib/libgeom/geom_stats.c @@ -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; |