changeset 780:e6af933f475e

farray.sh: Rename a local variable "child" to "__farr_child". "child" does not match the naming convention for (local) variables in farray.sh.
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 26 Oct 2024 13:56:06 +0200
parents 0bb535e50271
children aead7cf1cb9a
files share/local-bsdtools/farray.sh
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/share/local-bsdtools/farray.sh	Sat Oct 26 13:52:25 2024 +0200
+++ b/share/local-bsdtools/farray.sh	Sat Oct 26 13:56:06 2024 +0200
@@ -1831,7 +1831,7 @@
 _farr_array_heapsort() {
 
     local __farr_name __farr_token __farr_gvrname __farr_len \
-          __farr_start __farr_end __farr_root __farr_childp1 \
+          __farr_start __farr_end __farr_root __farr_child __farr_childp1 \
           __farr_tmpitem __farr_rootitem __farr_childitem __farr_childp1item
 
     __farr_start=$(( (__farr_len / 2) + 1))    # aka: iParent(of the last element)
@@ -1858,29 +1858,29 @@
         eval __farr_rootitem=\"\$\{"${__farr_gvrname}"_"${__farr_root}"\}\"
 #        echo "==== NEW ROOT: ${__farr_root},   a[root]: ${__farr_rootitem}"
         while [ $((2 * __farr_root)) -lt "${__farr_end}" ]; do
-            child=$((2 * __farr_root))
-            eval __farr_childitem=\"\$\{"${__farr_gvrname}"_"${child}"\}\"
-#            echo "CHILD: ${child},   ROOT: ${__farr_root},   END: ${__farr_end},   a[child]: ${__farr_childitem}"
+            __farr_child=$((2 * __farr_root))
+            eval __farr_childitem=\"\$\{"${__farr_gvrname}"_"${__farr_child}"\}\"
+#            echo "CHILD: ${__farr_child},   ROOT: ${__farr_root},   END: ${__farr_end},   a[child]: ${__farr_childitem}"
             # If there is a right child and that child is greater
-            __farr_childp1=$((child + 1))
+            __farr_childp1=$((__farr_child + 1))
             if [ "${__farr_childp1}" -lt "${__farr_end}" ]; then
                 eval __farr_childp1item=\"\$\{"${__farr_gvrname}"_"${__farr_childp1}"\}\"
 #                echo "===== a[child+1]: ${__farr_childp1item}"
                 if [ "${__farr_childitem}" '<' "${__farr_childp1item}" ]; then
                     #child=$((child + 1))
-                    child="${__farr_childp1}"
-                    eval __farr_childitem=\"\$\{"${__farr_gvrname}"_"${child}"\}\"
-#                    echo "====== INCR CHILD TO: $child"
+                    __farr_child="${__farr_childp1}"
+                    eval __farr_childitem=\"\$\{"${__farr_gvrname}"_"${__farr_child}"\}\"
+#                    echo "====== INCR CHILD TO: $__farr_child"
                 fi
             fi
 #            echo "====== a[root]: ${__farr_rootitem},   a[child]: ${__farr_childitem}"
             if [ "${__farr_rootitem}" '<' "${__farr_childitem}" ]; then
-#                echo "====== SWAPPING: root: ${__farr_root}, child: ${child}, a[root]: $__farr_rootitem, a[child]: $__farr_childitem"
+#                echo "====== SWAPPING: root: ${__farr_root}, child: ${__farr_child}, a[root]: $__farr_rootitem, a[child]: $__farr_childitem"
                 # swap(a[root], a[child])
                 setvar "${__farr_gvrname}"_"${__farr_root}" "${__farr_childitem}"
-                setvar "${__farr_gvrname}"_"${child}" "${__farr_rootitem}"
+                setvar "${__farr_gvrname}"_"${__farr_child}" "${__farr_rootitem}"
                 # repeat to continue sifting down
-                __farr_root="${child}"
+                __farr_root="${__farr_child}"
 
                 #
                 # XXX FIXME: Why are these lines not needed?