From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 17 Dec 2008 20:42:17 +0000 (-0800)
Subject: Resolve shadow conflict
X-Git-Tag: zfs-0.4.4~12^2~185^2^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da718dd80a89e1a1c43bd25d89841c4ab0eecfba;p=zfs

Resolve shadow conflict
---

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index effd2dba7..b273c6ef9 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -372,15 +372,15 @@ zfs_prop_user(const char *name)
  * (strings) and internal representation (uint64_t).
  */
 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
-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));
 }
 
 /*