]> granicus.if.org Git - zfs/commitdiff
Resolve shadow conflict
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 17 Dec 2008 21:01:56 +0000 (13:01 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 17 Dec 2008 21:01:56 +0000 (13:01 -0800)
module/zcommon/zpool_prop.c

index f5efe18d248b19d5e3a8de890bd1f818f3f480d3..562165b7a574a601bb9982ac47e24987b708e541 100644 (file)
@@ -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