diff options
| author | Don Brady <[email protected]> | 2017-11-04 14:25:13 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-11-04 13:25:13 -0700 |
| commit | 1c27024e22af4386b592b30d40e6a0820ceb48c1 (patch) | |
| tree | 689d4b821fd6910a137a0f93351351def5011cec /module/zcommon/zfeature_common.c | |
| parent | df1f129bc4150fd6ea3f23a01154a71ffa48bf12 (diff) | |
Undo c89 workarounds to match with upstream
With PR 5756 the zfs module now supports c99 and the
remaining past c89 workarounds can be undone.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Don Brady <[email protected]>
Closes #6816
Diffstat (limited to 'module/zcommon/zfeature_common.c')
| -rw-r--r-- | module/zcommon/zfeature_common.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c index 045162c68..7b782b45d 100644 --- a/module/zcommon/zfeature_common.c +++ b/module/zcommon/zfeature_common.c @@ -91,26 +91,21 @@ zfeature_is_valid_guid(const char *name) boolean_t zfeature_is_supported(const char *guid) { - spa_feature_t i; - if (zfeature_checks_disable) return (B_TRUE); - for (i = 0; i < SPA_FEATURES; i++) { + for (spa_feature_t i = 0; i < SPA_FEATURES; i++) { zfeature_info_t *feature = &spa_feature_table[i]; if (strcmp(guid, feature->fi_guid) == 0) return (B_TRUE); } - return (B_FALSE); } int zfeature_lookup_name(const char *name, spa_feature_t *res) { - spa_feature_t i; - - for (i = 0; i < SPA_FEATURES; i++) { + for (spa_feature_t i = 0; i < SPA_FEATURES; i++) { zfeature_info_t *feature = &spa_feature_table[i]; if (strcmp(name, feature->fi_uname) == 0) { if (res != NULL) @@ -126,9 +121,8 @@ boolean_t zfeature_depends_on(spa_feature_t fid, spa_feature_t check) { zfeature_info_t *feature = &spa_feature_table[fid]; - int i; - for (i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) { + for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) { if (feature->fi_depends[i] == check) return (B_TRUE); } @@ -138,9 +132,7 @@ zfeature_depends_on(spa_feature_t fid, spa_feature_t check) static boolean_t deps_contains_feature(const spa_feature_t *deps, const spa_feature_t feature) { - int i; - - for (i = 0; deps[i] != SPA_FEATURE_NONE; i++) + for (int i = 0; deps[i] != SPA_FEATURE_NONE; i++) if (deps[i] == feature) return (B_TRUE); |