diff options
| author | Brian Behlendorf <[email protected]> | 2008-12-17 13:10:38 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-12-17 13:10:38 -0800 |
| commit | 9842c708fa3af158d694de9bfc19089566ff1920 (patch) | |
| tree | 1b62e529c1fc5cf7f5c736cac416e12378dae3b4 /module | |
| parent | e41d37c49d699a9b108052be6e1b9585ecb81c66 (diff) | |
| parent | 1e3aeaaef170d49f31323bc327ac2849ab256dd9 (diff) | |
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
Diffstat (limited to 'module')
| -rw-r--r-- | module/zcommon/zprop_common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c index c3314be17..a9f2ab315 100644 --- a/module/zcommon/zprop_common.c +++ b/module/zcommon/zprop_common.c @@ -261,7 +261,7 @@ zprop_name_to_prop(const char *propname, zfs_type_t type) } int -zprop_string_to_index(int prop, const char *string, uint64_t *index, +zprop_string_to_index(int prop, const char *string, uint64_t *idx, zfs_type_t type) { zprop_desc_t *prop_tbl; @@ -278,7 +278,7 @@ zprop_string_to_index(int prop, const char *string, uint64_t *index, for (i = 0; idx_tbl[i].pi_name != NULL; i++) { if (strcmp(string, idx_tbl[i].pi_name) == 0) { - *index = idx_tbl[i].pi_value; + *idx = idx_tbl[i].pi_value; return (0); } } @@ -287,7 +287,7 @@ zprop_string_to_index(int prop, const char *string, uint64_t *index, } int -zprop_index_to_string(int prop, uint64_t index, const char **string, +zprop_index_to_string(int prop, uint64_t idx, const char **string, zfs_type_t type) { zprop_desc_t *prop_tbl; @@ -303,7 +303,7 @@ zprop_index_to_string(int prop, uint64_t index, const char **string, return (-1); for (i = 0; idx_tbl[i].pi_name != NULL; i++) { - if (idx_tbl[i].pi_value == index) { + if (idx_tbl[i].pi_value == idx) { *string = idx_tbl[i].pi_name; return (0); } |