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 12:42:17 -08:00
parent 8af904a4b0
commit da718dd80a
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/zfs_prop.c
View File

@ -372,15 +372,15 @@ zfs_prop_user(const char *name)
* (strings) and internal representation (uint64_t). * (strings) and internal representation (uint64_t).
*/ */
int int
zfs_prop_string_to_index(zfs_prop_t prop, const char *string, uint64_t *index) zfs_prop_string_to_index(zfs_prop_t prop, const char *string, uint64_t *idx)
{ {
return (zprop_string_to_index(prop, string, index, ZFS_TYPE_DATASET)); return (zprop_string_to_index(prop, string, idx, ZFS_TYPE_DATASET));
} }
int int
zfs_prop_index_to_string(zfs_prop_t prop, uint64_t index, const char **string) zfs_prop_index_to_string(zfs_prop_t prop, uint64_t idx, const char **string)
{ {
return (zprop_index_to_string(prop, index, string, ZFS_TYPE_DATASET)); return (zprop_index_to_string(prop, idx, string, ZFS_TYPE_DATASET));
} }
/* /*