From 418ede0ae46fae09dc2040a8b6853f038892c448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Witkowski?= Date: Tue, 5 May 2026 22:08:34 +0200 Subject: [PATCH] dhcp-to-dns: make ToLower a local function, no global-functions dependency --- dhcp-to-dns.rsc | 17 ++++++++++++++++- global-functions.rsc | 19 ------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc index 570282dc..1627f5a5 100644 --- a/dhcp-to-dns.rsc +++ b/dhcp-to-dns.rsc @@ -27,13 +27,28 @@ :global LogPrintOnce; :global ParseKeyValueStore; :global ScriptLock; - :global ToLower; :if ([ $ScriptLock $ScriptName 10 ] = false) do={ :set ExitOK true; :error false; } + :local ToLower do={ + :local Input [ :tostr $1 ]; + :local Upper "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + :local Lower "abcdefghijklmnopqrstuvwxyz"; + :local Return ""; + :for I from=0 to=([ :len $Input ] - 1) do={ + :local Char [ :pick $Input $I ]; + :local Pos [ :find $Upper $Char ]; + :if ([ :typeof $Pos ] != "nil") do={ + :set Char [ :pick $Lower $Pos ($Pos + 1) ]; + } + :set Return ($Return . $Char); + } + :return $Return; + } + :local Ttl 5m; :local CommentPrefix ("managed by " . $ScriptName); :local CommentString ("--- " . $ScriptName . " above ---"); diff --git a/global-functions.rsc b/global-functions.rsc index 9dcb4648..10a9b5ac 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -81,7 +81,6 @@ :global SendNotification2; :global SymbolByUnicodeName; :global SymbolForNotification; -:global ToLower; :global Unix2Dos; :global UrlEncode; :global ValidateSyntax; @@ -303,24 +302,6 @@ :return $Path; } -# convert string to lower case -:set ToLower do={ - :local Input [ :tostr $1 ]; - :local Upper "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - :local Lower "abcdefghijklmnopqrstuvwxyz"; - :local Return ""; - - :for I from=0 to=([ :len $Input ] - 1) do={ - :local Char [ :pick $Input $I ]; - :local Pos [ :find $Upper $Char ]; - :if ([ :typeof $Pos ] != "nil") do={ - :set Char [ :pick $Lower $Pos ($Pos + 1) ]; - } - :set Return ($Return . $Char); - } - :return $Return; -} - # clean name for DNS, file and more :set CleanName do={ :local Input [ :tostr $1 ];