From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Jul 2017 00:54:27 +0000 (-0400)
Subject: Drop deprecated listsort function
X-Git-Tag: 009~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3de4b7c4644e6df1509384ccf10b0517d2039dd0;p=people%2Fms%2Fnetwork.git

Drop deprecated listsort function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.settings b/src/functions/functions.settings
index c73349ae..630f90aa 100644
--- a/src/functions/functions.settings
+++ b/src/functions/functions.settings
@@ -165,7 +165,7 @@ settings_write() {
 	> ${settings_file}
 
 	local param
-	for param in $(listsort $@); do
+	for param in $(list_sort $@); do
 		echo "${param}=\"${!param}\"" >> ${settings_file}
 	done
 }
@@ -185,7 +185,7 @@ settings_remove() {
 settings_print() {
 	local param
 
-	for param in $(listsort $@); do
+	for param in $(list_sort $@); do
 		printf "%-32s = %s\n" "${param}" "${!param}"
 	done
 }
diff --git a/src/functions/functions.util b/src/functions/functions.util
index 0a9b3d6b..99af3b4e 100644
--- a/src/functions/functions.util
+++ b/src/functions/functions.util
@@ -82,12 +82,8 @@ warning_log() {
 	log WARNING "$@"
 }
 
-# The next three functions are kept for backwards
+# The next two functions are kept for backwards
 # compatibility. The need to be dropped at some time.
-listsort() {
-	list_sort $@
-}
-
 listmatch() {
 	list_match $@
 }