diff options
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/net/wanboot/p12aux.h | 9 | ||||
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.c | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/common/net/wanboot/p12aux.h b/usr/src/common/net/wanboot/p12aux.h index 76c71c9cb6..be07683c37 100644 --- a/usr/src/common/net/wanboot/p12aux.h +++ b/usr/src/common/net/wanboot/p12aux.h @@ -24,11 +24,13 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2015 by Delphix. All rights reserved. + */ + #ifndef _P12AUX_H #define _P12AUX_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <openssl/pkcs12.h> #ifdef __cplusplus @@ -42,7 +44,8 @@ extern "C" { * * My apologies. */ -DECLARE_STACK_OF(EVP_PKEY) +/* LINTED */ +DECLARE_STACK_OF(EVP_PKEY); #define sk_EVP_PKEY_new_null() SKM_sk_new_null(EVP_PKEY) #define sk_EVP_PKEY_free(st) SKM_sk_free(EVP_PKEY, (st)) diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index f75894b44d..a001255289 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -118,7 +118,8 @@ zfeature_lookup_name(const char *name, spa_feature_t *res) } boolean_t -zfeature_depends_on(spa_feature_t fid, spa_feature_t check) { +zfeature_depends_on(spa_feature_t fid, spa_feature_t check) +{ zfeature_info_t *feature = &spa_feature_table[fid]; for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) { |