Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve shadow conflict

This commit is contained in:
Brian Behlendorf 2008-12-17 13:08:39 -08:00
parent fafeacb53f
commit 1e3aeaaef1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/zcommon/zprop_common.c
View File

@ -261,7 +261,7 @@ zprop_name_to_prop(const char *propname, zfs_type_t type)
} }
int 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) zfs_type_t type)
{ {
zprop_desc_t *prop_tbl; 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++) { for (i = 0; idx_tbl[i].pi_name != NULL; i++) {
if (strcmp(string, idx_tbl[i].pi_name) == 0) { if (strcmp(string, idx_tbl[i].pi_name) == 0) {
*index = idx_tbl[i].pi_value; *idx = idx_tbl[i].pi_value;
return (0); return (0);
} }
} }
@ -287,7 +287,7 @@ zprop_string_to_index(int prop, const char *string, uint64_t *index,
} }
int 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) zfs_type_t type)
{ {
zprop_desc_t *prop_tbl; zprop_desc_t *prop_tbl;
@ -303,7 +303,7 @@ zprop_index_to_string(int prop, uint64_t index, const char **string,
return (-1); return (-1);
for (i = 0; idx_tbl[i].pi_name != NULL; i++) { 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; *string = idx_tbl[i].pi_name;
return (0); return (0);
} }