Rename awk(1) implementation of GNU awk's built-in asorti() function to

prevent fatal conflict should one-true-awk ever be replaced -- e.g., in
an appliance -- with GNU awk. NB: Renamed my implementation to _asorti()

MFC after:	3 days
X-MFC-to:	stable/10, stable/9
This commit is contained in:
Devin Teske 2014-10-14 03:22:37 +00:00
parent 489979a77d
commit 09866e97a6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=273068
3 changed files with 6 additions and 6 deletions

View File

@ -69,7 +69,7 @@ show_include()
-v use_color=${USE_COLOR:-0} \
-v re="$pattern" \
-v show_desc=${SHOW_DESC:-0} '
function asorti(src, dest)
function _asorti(src, dest)
{
k = nitems = 0;
@ -120,7 +120,7 @@ show_include()
}
}
END {
n = asorti(syntax, sorted_indices)
n = _asorti(syntax, sorted_indices)
for (i = 1; i <= n; i++)
printf "%s", syntax[sorted_indices[i]]
}' "$file" )

View File

@ -1116,7 +1116,7 @@ f_device_shutdown()
f_device_sort_by_awk='
# Variables that should be defined on the invocation line:
# -v prop="property"
function asorti(src, dest)
function _asorti(src, dest)
{
k = nitems = 0
for (i in src) dest[++nitems] = i
@ -1137,7 +1137,7 @@ function asorti(src, dest)
}
}
END {
nitems = asorti(devices, devices_sorted)
nitems = _asorti(devices, devices_sorted)
for (i = 1; i <= nitems; i++) print devices[devices_sorted[i]]
}
'

View File

@ -241,7 +241,7 @@ f_index_read()
export msg_packages
eval "$( debug= f_getvar "$var_to_get" | awk -F'|' '
function asorti(src, dest)
function _asorti(src, dest)
{
k = nitems = 0
@ -292,7 +292,7 @@ f_index_read()
END {
print "_npkgs=" tpkgs # For convenience, total package count
n = asorti(categories, categories_sorted)
n = _asorti(categories, categories_sorted)
# Produce package counts for each category
for (i = 1; i <= n; i++)