From d1807f168edd09ca26a5a0c6b570686b982808ad Mon Sep 17 00:00:00 2001
From: Richard Yao <richard.yao@alumni.stonybrook.edu>
Date: Sat, 11 Mar 2023 13:39:24 -0500
Subject: nvpair: Constify string functions

After addressing coverity complaints involving `nvpair_name()`, the
compiler started complaining about dropping const. This lead to a rabbit
hole where not only `nvpair_name()` needed to be constified, but also
`nvpair_value_string()`, `fnvpair_value_string()` and a few other static
functions, plus variable pointers throughout the code. The result became
a fairly big change, so it has been split out into its own patch.

Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #14612
---
 lib/libnvpair/libnvpair.abi | 74 +++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

(limited to 'lib/libnvpair/libnvpair.abi')

diff --git a/lib/libnvpair/libnvpair.abi b/lib/libnvpair/libnvpair.abi
index 5900a6551..ef92f3e9b 100644
--- a/lib/libnvpair/libnvpair.abi
+++ b/lib/libnvpair/libnvpair.abi
@@ -243,6 +243,9 @@
     <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='160' id='664ac0b7'>
       <subrange length='20' type-id='7359adad' id='fdca39cf'/>
     </array-type-def>
+    <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='infinite' id='e84913bd'>
+      <subrange length='infinite' type-id='7359adad' id='031f2035'/>
+    </array-type-def>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>
     <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>
     <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>
@@ -321,6 +324,9 @@
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='nvp_type' type-id='8d0687d2' visibility='default'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='nvp_name' type-id='e84913bd' visibility='default'/>
+      </data-member>
     </class-decl>
     <typedef-decl name='nvpair_t' type-id='1c34e459' id='57928edf'/>
     <class-decl name='nvlist' size-in-bits='192' is-struct='yes' visibility='default' id='ac266fd9'>
@@ -698,7 +704,7 @@
     </class-decl>
     <class-decl name='__anonymous_struct__12' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='e7f43f7e'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='c0d0f877' visibility='default'/>
+        <var-decl name='op' type-id='bfc48fe4' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='arg' type-id='eaa32e2f' visibility='default'/>
@@ -802,7 +808,7 @@
     </class-decl>
     <class-decl name='__anonymous_struct__25' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='e7f43f8b'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='de20bf07' visibility='default'/>
+        <var-decl name='op' type-id='337f4a72' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='arg' type-id='eaa32e2f' visibility='default'/>
@@ -858,11 +864,11 @@
     <pointer-type-def type-id='c19b74c3' size-in-bits='64' id='37e3bd22'/>
     <pointer-type-def type-id='37e3bd22' size-in-bits='64' id='03829398'/>
     <pointer-type-def type-id='a84c031d' size-in-bits='64' id='26a90f95'/>
-    <pointer-type-def type-id='26a90f95' size-in-bits='64' id='9b23c9ad'/>
-    <pointer-type-def type-id='9b23c9ad' size-in-bits='64' id='c0563f85'/>
     <qualified-type-def type-id='a84c031d' const='yes' id='9b45d938'/>
     <pointer-type-def type-id='9b45d938' size-in-bits='64' id='80f4b756'/>
     <qualified-type-def type-id='80f4b756' restrict='yes' id='9d26089a'/>
+    <pointer-type-def type-id='80f4b756' size-in-bits='64' id='7d3cd834'/>
+    <pointer-type-def type-id='7d3cd834' size-in-bits='64' id='44c8373a'/>
     <qualified-type-def type-id='57928edf' const='yes' id='642ee20f'/>
     <pointer-type-def type-id='642ee20f' size-in-bits='64' id='dace003f'/>
     <qualified-type-def type-id='aca3bac8' const='yes' id='2498fd78'/>
@@ -871,8 +877,8 @@
     <pointer-type-def type-id='a0eb0f08' size-in-bits='64' id='7408d286'/>
     <pointer-type-def type-id='cebdd548' size-in-bits='64' id='e379e62d'/>
     <pointer-type-def type-id='9f88f76e' size-in-bits='64' id='7ef0e988'/>
-    <pointer-type-def type-id='c5bb1a2b' size-in-bits='64' id='c0d0f877'/>
-    <pointer-type-def type-id='573fea1b' size-in-bits='64' id='de20bf07'/>
+    <pointer-type-def type-id='889f3b42' size-in-bits='64' id='bfc48fe4'/>
+    <pointer-type-def type-id='49055dd8' size-in-bits='64' id='337f4a72'/>
     <pointer-type-def type-id='70284cc6' size-in-bits='64' id='3be4d568'/>
     <pointer-type-def type-id='700c3bca' size-in-bits='64' id='6d994334'/>
     <pointer-type-def type-id='18ac1860' size-in-bits='64' id='506ab59a'/>
@@ -898,8 +904,8 @@
     <pointer-type-def type-id='3bd73b0c' size-in-bits='64' id='7e85a9b6'/>
     <pointer-type-def type-id='0d445e26' size-in-bits='64' id='330cc0d0'/>
     <pointer-type-def type-id='e4b89f30' size-in-bits='64' id='ed8aa8ba'/>
-    <pointer-type-def type-id='be7f4941' size-in-bits='64' id='2809de35'/>
-    <pointer-type-def type-id='fe5ae69d' size-in-bits='64' id='90d5edb9'/>
+    <pointer-type-def type-id='78e3bec8' size-in-bits='64' id='b38a1022'/>
+    <pointer-type-def type-id='a5193bb2' size-in-bits='64' id='6263eda4'/>
     <pointer-type-def type-id='2783af3c' size-in-bits='64' id='e44553b6'/>
     <pointer-type-def type-id='33c6e3d8' size-in-bits='64' id='1263777a'/>
     <pointer-type-def type-id='dadb9eca' size-in-bits='64' id='cbda43ac'/>
@@ -966,7 +972,7 @@
     </function-decl>
     <function-decl name='nvpair_name' mangled-name='nvpair_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_name'>
       <parameter type-id='dace003f'/>
-      <return type-id='26a90f95'/>
+      <return type-id='80f4b756'/>
     </function-decl>
     <function-decl name='nvpair_type' mangled-name='nvpair_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type'>
       <parameter type-id='dace003f'/>
@@ -1027,8 +1033,8 @@
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvpair_value_string' mangled-name='nvpair_value_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string'>
-      <parameter type-id='3fa542f0'/>
-      <parameter type-id='9b23c9ad'/>
+      <parameter type-id='dace003f'/>
+      <parameter type-id='7d3cd834'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvpair_value_nvlist' mangled-name='nvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_nvlist'>
@@ -1098,7 +1104,7 @@
     </function-decl>
     <function-decl name='nvpair_value_string_array' mangled-name='nvpair_value_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string_array'>
       <parameter type-id='3fa542f0'/>
-      <parameter type-id='c0563f85'/>
+      <parameter type-id='44c8373a'/>
       <parameter type-id='4dd26a40'/>
       <return type-id='95e97e5e'/>
     </function-decl>
@@ -1280,7 +1286,7 @@
     </function-decl>
     <function-decl name='nvlist_prtctlop_string' mangled-name='nvlist_prtctlop_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string'>
       <parameter type-id='b0c1ff8d' name='pctl'/>
-      <parameter type-id='2809de35' name='func'/>
+      <parameter type-id='b38a1022' name='func'/>
       <parameter type-id='eaa32e2f' name='private'/>
       <return type-id='48b5725f'/>
     </function-decl>
@@ -1358,7 +1364,7 @@
     </function-decl>
     <function-decl name='nvlist_prtctlop_string_array' mangled-name='nvlist_prtctlop_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string_array'>
       <parameter type-id='b0c1ff8d' name='pctl'/>
-      <parameter type-id='90d5edb9' name='func'/>
+      <parameter type-id='6263eda4' name='func'/>
       <parameter type-id='eaa32e2f' name='private'/>
       <return type-id='48b5725f'/>
     </function-decl>
@@ -1393,16 +1399,16 @@
     <function-decl name='nvpair_value_match_regex' mangled-name='nvpair_value_match_regex' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match_regex'>
       <parameter type-id='3fa542f0' name='nvp'/>
       <parameter type-id='95e97e5e' name='ai'/>
-      <parameter type-id='26a90f95' name='value'/>
+      <parameter type-id='80f4b756' name='value'/>
       <parameter type-id='d33f11cb' name='value_regex'/>
-      <parameter type-id='9b23c9ad' name='ep'/>
+      <parameter type-id='7d3cd834' name='ep'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvpair_value_match' mangled-name='nvpair_value_match' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match'>
       <parameter type-id='3fa542f0' name='nvp'/>
       <parameter type-id='95e97e5e' name='ai'/>
-      <parameter type-id='26a90f95' name='value'/>
-      <parameter type-id='9b23c9ad' name='ep'/>
+      <parameter type-id='80f4b756' name='value'/>
+      <parameter type-id='7d3cd834' name='ep'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-type size-in-bits='64' id='9f88f76e'>
@@ -1414,20 +1420,20 @@
       <parameter type-id='3502e3ff'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='c5bb1a2b'>
+    <function-type size-in-bits='64' id='889f3b42'>
       <parameter type-id='196db161'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='5ce45b60'/>
       <parameter type-id='80f4b756'/>
-      <parameter type-id='26a90f95'/>
+      <parameter type-id='80f4b756'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='573fea1b'>
+    <function-type size-in-bits='64' id='49055dd8'>
       <parameter type-id='196db161'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='5ce45b60'/>
       <parameter type-id='80f4b756'/>
-      <parameter type-id='9b23c9ad'/>
+      <parameter type-id='7d3cd834'/>
       <parameter type-id='3502e3ff'/>
       <return type-id='95e97e5e'/>
     </function-type>
@@ -1642,20 +1648,20 @@
       <parameter type-id='3502e3ff'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='be7f4941'>
+    <function-type size-in-bits='64' id='78e3bec8'>
       <parameter type-id='b0c1ff8d'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='5ce45b60'/>
       <parameter type-id='80f4b756'/>
-      <parameter type-id='26a90f95'/>
+      <parameter type-id='80f4b756'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='fe5ae69d'>
+    <function-type size-in-bits='64' id='a5193bb2'>
       <parameter type-id='b0c1ff8d'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='5ce45b60'/>
       <parameter type-id='80f4b756'/>
-      <parameter type-id='9b23c9ad'/>
+      <parameter type-id='7d3cd834'/>
       <parameter type-id='3502e3ff'/>
       <return type-id='95e97e5e'/>
     </function-type>
@@ -1930,8 +1936,8 @@
       <return type-id='9c313c2d'/>
     </function-decl>
     <function-decl name='fnvpair_value_string' mangled-name='fnvpair_value_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_string'>
-      <parameter type-id='3fa542f0'/>
-      <return type-id='26a90f95'/>
+      <parameter type-id='dace003f'/>
+      <return type-id='80f4b756'/>
     </function-decl>
     <function-decl name='fnvpair_value_nvlist' mangled-name='fnvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_nvlist'>
       <parameter type-id='3fa542f0'/>
@@ -2327,9 +2333,9 @@
       <return type-id='9c313c2d'/>
     </function-decl>
     <function-decl name='fnvlist_lookup_string' mangled-name='fnvlist_lookup_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_string'>
-      <parameter type-id='5ce45b60' name='nvl'/>
+      <parameter type-id='22cce67b' name='nvl'/>
       <parameter type-id='80f4b756' name='name'/>
-      <return type-id='26a90f95'/>
+      <return type-id='80f4b756'/>
     </function-decl>
     <function-decl name='fnvlist_lookup_nvlist' mangled-name='fnvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_nvlist'>
       <parameter type-id='5ce45b60' name='nvl'/>
@@ -2466,7 +2472,9 @@
     <typedef-decl name='u_quad_t' type-id='5f3d50a6' id='bd226ac0'/>
     <pointer-type-def type-id='bc407f0e' size-in-bits='64' id='17fd1621'/>
     <pointer-type-def type-id='755707df' size-in-bits='64' id='812c6697'/>
+    <pointer-type-def type-id='26a90f95' size-in-bits='64' id='9b23c9ad'/>
     <qualified-type-def type-id='9b23c9ad' restrict='yes' id='8c85230f'/>
+    <pointer-type-def type-id='9b23c9ad' size-in-bits='64' id='c0563f85'/>
     <qualified-type-def type-id='c19b74c3' const='yes' id='12373e33'/>
     <pointer-type-def type-id='12373e33' size-in-bits='64' id='c5f6c15b'/>
     <qualified-type-def type-id='80f4b756' const='yes' id='b99c00c9'/>
@@ -2925,9 +2933,9 @@
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvlist_lookup_string' mangled-name='nvlist_lookup_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_string'>
-      <parameter type-id='5ce45b60' name='nvl'/>
+      <parameter type-id='22cce67b' name='nvl'/>
       <parameter type-id='80f4b756' name='name'/>
-      <parameter type-id='9b23c9ad' name='val'/>
+      <parameter type-id='7d3cd834' name='val'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvlist_lookup_nvlist' mangled-name='nvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvlist'>
@@ -3043,7 +3051,7 @@
       <parameter type-id='80f4b756' name='name'/>
       <parameter type-id='0b283d2e' name='ret'/>
       <parameter type-id='7292109c' name='ip'/>
-      <parameter type-id='9b23c9ad' name='ep'/>
+      <parameter type-id='7d3cd834' name='ep'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='nvlist_exists' mangled-name='nvlist_exists' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_exists'>
-- 
cgit v1.2.3