diff options
author | George Melikov <[email protected]> | 2017-01-21 00:17:55 +0300 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-01-22 13:25:40 -0800 |
commit | 4ea3f86426f76e59244ec6f66504da688d90193c (patch) | |
tree | ff907fb2ce89e00b8b89a0a653c9b4e7005f6935 /lib | |
parent | ec441a9c534815b379468a2d349011cbd5bcd884 (diff) |
codebase style improvements for OpenZFS 6459 port
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libnvpair/libnvpair.c | 3 | ||||
-rw-r--r-- | lib/libshare/libshare.c | 6 | ||||
-rw-r--r-- | lib/libspl/include/sys/byteorder.h | 12 | ||||
-rw-r--r-- | lib/libspl/include/umem.h | 3 | ||||
-rw-r--r-- | lib/libzpool/taskq.c | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/lib/libnvpair/libnvpair.c b/lib/libnvpair/libnvpair.c index b852cb617..7e24dd844 100644 --- a/lib/libnvpair/libnvpair.c +++ b/lib/libnvpair/libnvpair.c @@ -475,7 +475,8 @@ NVLIST_PRINTCTL_AREPLACE(nvlist_array, nvlist_t **) */ -static const struct nvlist_printops defprtops = { +static const struct nvlist_printops defprtops = +{ { nvprint_boolean, NULL }, { nvprint_boolean_value, NULL }, { nvprint_byte, NULL }, diff --git a/lib/libshare/libshare.c b/lib/libshare/libshare.c index 41fe8bb6c..aa565ca82 100644 --- a/lib/libshare/libshare.c +++ b/lib/libshare/libshare.c @@ -108,7 +108,8 @@ libshare_init(void) } static void -parse_sharetab(sa_handle_impl_t impl_handle) { +parse_sharetab(sa_handle_impl_t impl_handle) +{ FILE *fp; char line[512]; char *eol, *pathname, *resource, *fstype, *options, *description; @@ -759,7 +760,8 @@ alloc_share(const char *sharepath) } static void -free_share(sa_share_impl_t impl_share) { +free_share(sa_share_impl_t impl_share) +{ sa_fstype_t *fstype; fstype = fstypes; diff --git a/lib/libspl/include/sys/byteorder.h b/lib/libspl/include/sys/byteorder.h index 7ef1c4295..72d40b164 100644 --- a/lib/libspl/include/sys/byteorder.h +++ b/lib/libspl/include/sys/byteorder.h @@ -130,22 +130,26 @@ extern in_port_t ntohs(in_port_t); #ifdef _BIG_ENDIAN static __inline__ uint64_t -htonll(uint64_t n) { +htonll(uint64_t n) +{ return (n); } static __inline__ uint64_t -ntohll(uint64_t n) { +ntohll(uint64_t n) +{ return (n); } #else static __inline__ uint64_t -htonll(uint64_t n) { +htonll(uint64_t n) +{ return ((((uint64_t)htonl(n)) << 32) + htonl(n >> 32)); } static __inline__ uint64_t -ntohll(uint64_t n) { +ntohll(uint64_t n) +{ return ((((uint64_t)ntohl(n)) << 32) + ntohl(n >> 32)); } #endif diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h index a89cb4950..c63026cee 100644 --- a/lib/libspl/include/umem.h +++ b/lib/libspl/include/umem.h @@ -131,7 +131,8 @@ umem_free(void *ptr, size_t size) } static inline void -umem_nofail_callback(umem_nofail_callback_t *cb) {} +umem_nofail_callback(umem_nofail_callback_t *cb) +{} static inline umem_cache_t * umem_cache_create( diff --git a/lib/libzpool/taskq.c b/lib/libzpool/taskq.c index 791d50981..ae67906fe 100644 --- a/lib/libzpool/taskq.c +++ b/lib/libzpool/taskq.c @@ -246,7 +246,7 @@ taskq_thread(void *arg) /*ARGSUSED*/ taskq_t * taskq_create(const char *name, int nthreads, pri_t pri, - int minalloc, int maxalloc, uint_t flags) + int minalloc, int maxalloc, uint_t flags) { taskq_t *tq = kmem_zalloc(sizeof (taskq_t), KM_SLEEP); int t; |