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

Resolve shadow conflict
---

diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
index f5efe18d2..562165b7a 100644
--- a/module/zcommon/zpool_prop.c
+++ b/module/zcommon/zpool_prop.c
@@ -152,16 +152,16 @@ zpool_prop_default_numeric(zpool_prop_t prop)
 
 int
 zpool_prop_string_to_index(zpool_prop_t prop, const char *string,
-    uint64_t *index)
+    uint64_t *idx)
 {
-	return (zprop_string_to_index(prop, string, index, ZFS_TYPE_POOL));
+	return (zprop_string_to_index(prop, string, idx, ZFS_TYPE_POOL));
 }
 
 int
-zpool_prop_index_to_string(zpool_prop_t prop, uint64_t index,
+zpool_prop_index_to_string(zpool_prop_t prop, uint64_t idx,
     const char **string)
 {
-	return (zprop_index_to_string(prop, index, string, ZFS_TYPE_POOL));
+	return (zprop_index_to_string(prop, idx, string, ZFS_TYPE_POOL));
 }
 
 #ifndef _KERNEL