From 04025da9b82260544c60019394fb88428fb215ce Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 21 Feb 2019 00:03:57 +0100 Subject: [PATCH] global-functions: drop $Read, use :return directly --- accesslist-duplicates.capsman | 4 +--- accesslist-duplicates.local | 4 +--- accesslist-duplicates.template | 4 +--- global-functions | 5 ----- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/accesslist-duplicates.capsman b/accesslist-duplicates.capsman index b0df339..633c771 100644 --- a/accesslist-duplicates.capsman +++ b/accesslist-duplicates.capsman @@ -6,8 +6,6 @@ # # !! Do not edit this file, it is generated from template! -:global Read; - :local Seen [ :toarray "" ]; :local Shown [ :toarray "" ]; @@ -24,7 +22,7 @@ :set Shown ($Shown, $Mac); :put "\nEnter to skip, numeric id to remove!"; - :local Remove [ $Read ]; + :local Remove [ :return ]; :if ($Remove != "") do={ :put ("Removing numeric id " . $Remove . "...\n"); / caps-man access-list remove $Remove; diff --git a/accesslist-duplicates.local b/accesslist-duplicates.local index 552a04a..cf14c3d 100644 --- a/accesslist-duplicates.local +++ b/accesslist-duplicates.local @@ -6,8 +6,6 @@ # # !! Do not edit this file, it is generated from template! -:global Read; - :local Seen [ :toarray "" ]; :local Shown [ :toarray "" ]; @@ -24,7 +22,7 @@ :set Shown ($Shown, $Mac); :put "\nEnter to skip, numeric id to remove!"; - :local Remove [ $Read ]; + :local Remove [ :return ]; :if ($Remove != "") do={ :put ("Removing numeric id " . $Remove . "...\n"); / interface wireless access-list remove $Remove; diff --git a/accesslist-duplicates.template b/accesslist-duplicates.template index 18225a6..9bb3ce1 100644 --- a/accesslist-duplicates.template +++ b/accesslist-duplicates.template @@ -7,8 +7,6 @@ # !! This is just a template! Replace '%PATH%' with 'caps-man' # !! or 'interface wireless'! -:global Read; - :local Seen [ :toarray "" ]; :local Shown [ :toarray "" ]; @@ -25,7 +23,7 @@ :set Shown ($Shown, $Mac); :put "\nEnter to skip, numeric id to remove!"; - :local Remove [ $Read ]; + :local Remove [ :return ]; :if ($Remove != "") do={ :put ("Removing numeric id " . $Remove . "...\n"); / %PATH% access-list remove $Remove; diff --git a/global-functions b/global-functions index 8c4d41d..b22a295 100644 --- a/global-functions +++ b/global-functions @@ -12,11 +12,6 @@ :global SentLteFirmwareUpgradeNotification "-"; :global Identity [ / system identity get name ]; -# read input from user -:global Read do={ - :return; -} - # url encoding :global UrlEncode do={ :local Input [ :tostr $1 ];