treewide: convert deprecated syntax

 - `local` has been deprecated in favor to `let`
 - `delete(obj, "prop")` has been depracted in favor to `delete obj.prop`

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/root/usr/share/firewall4/templates/ruleset.uc b/root/usr/share/firewall4/templates/ruleset.uc
index 16652c6a0e37836503fe519de34c84e7305ece6c..e67fd7eca861f820e19272351a6546ea6c17eccc 100644 (file)
--- a/root/usr/share/firewall4/templates/ruleset.uc
+++ b/root/usr/share/firewall4/templates/ruleset.uc
@@ -56,10 +56,10 @@ table inet fw4 {
 {% if (fw4.default_option("synflood_protect")): %}
                tcp flags & (fin | syn | rst | ack) == syn jump syn_flood comment "!fw4: Rate limit TCP syn packets"
 {% endif %}
-{% for (local rule in fw4.rules("input")): %}
+{% for (let rule in fw4.rules("input")): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
-{% for (local zone in fw4.zones()): for (local rule in zone.match_rules): %}
+{% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
                {%+ include("zone-match.uc", { fw4, zone, rule, direction: "input" }) %}
 {% endfor; endfor %}
 {% if (fw4.input_policy() == "reject"): %}
@@ -74,10 +74,10 @@ table inet fw4 {
 {% if (fw4.default_option("drop_invalid")): %}
                ct state invalid drop comment "!fw4: Drop flows with invalid conntrack state"
 {% endif %}
-{% for (local rule in fw4.rules("forward")): %}
+{% for (let rule in fw4.rules("forward")): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
-{% for (local zone in fw4.zones()): for (local rule in zone.match_rules): %}
+{% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
                {%+ include("zone-match.uc", { fw4, zone, rule, direction: "forward" }) %}
 {% endfor; endfor %}
 {% if (fw4.forward_policy() == "reject"): %}
@@ -94,10 +94,10 @@ table inet fw4 {
 {% if (fw4.default_option("drop_invalid")): %}
                ct state invalid drop comment "!fw4: Drop flows with invalid conntrack state"
 {% endif %}
-{% for (local rule in fw4.rules("output")): %}
+{% for (let rule in fw4.rules("output")): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {% endfor %}
-{% for (local zone in fw4.zones()): for (local rule in zone.match_rules): %}
+{% for (let zone in fw4.zones()): for (let rule in zone.match_rules): %}
                {%+ include("zone-match.uc", { fw4, zone, rule, direction: "output" }) %}
 {% endfor; endfor %}
 {% if (fw4.output_policy() == "reject"): %}
@@ -119,8 +119,8 @@ table inet fw4 {
        }
 
 {% if (fw4.default_option("synflood_protect")):
-       local r = fw4.default_option("synflood_rate");
-       local b = fw4.default_option("synflood_burst");
+       let r = fw4.default_option("synflood_rate");
+       let b = fw4.default_option("synflood_burst");
 %}
        chain syn_flood {
                tcp flags & (fin | syn | rst | ack) == syn
@@ -130,9 +130,9 @@ table inet fw4 {
        }
 
 {% endif %}
-{% for (local zone in fw4.zones()): %}
+{% for (let zone in fw4.zones()): %}
        chain input_{{ zone.name }} {
-{%  for (local rule in fw4.rules("input_"+zone.name)): %}
+{%  for (let rule in fw4.rules("input_"+zone.name)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
 {%  if (zone.dflags.dnat): %}
@@ -142,14 +142,14 @@ table inet fw4 {
        }
 
        chain output_{{ zone.name }} {
-{%  for (local rule in fw4.rules("output_"+zone.name)): %}
+{%  for (let rule in fw4.rules("output_"+zone.name)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
                jump {{ zone.output }}_to_{{ zone.name }}
        }
 
        chain forward_{{ zone.name }} {
-{%  for (local rule in fw4.rules("forward_"+zone.name)): %}
+{%  for (let rule in fw4.rules("forward_"+zone.name)): %}
                {%+ include("rule.uc", { fw4, rule }) %}
 {%  endfor %}
 {%  if (zone.dflags.dnat): %}
@@ -158,10 +158,10 @@ table inet fw4 {
                jump {{ zone.forward }}_to_{{ zone.name }}
        }
 
-{%  for (local verdict in ["accept", "reject", "drop"]): %}
+{%  for (let verdict in ["accept", "reject", "drop"]): %}
 {%   if (zone.sflags[verdict]): %}
        chain {{ verdict }}_from_{{ zone.name }} {
-{%    for (local rule in zone.match_rules): %}
+{%    for (let rule in zone.match_rules): %}
                {%+ include("zone-verdict.uc", { fw4, zone, rule, egress: false, verdict }) %}
 {%    endfor %}
        }
@@ -169,7 +169,7 @@ table inet fw4 {
 {%   endif %}
 {%   if (zone.dflags[verdict]): %}
        chain {{ verdict }}_to_{{ zone.name }} {
-{%   for (local rule in zone.match_rules): %}
+{%   for (let rule in zone.match_rules): %}
                {%+ include("zone-verdict.uc", { fw4, zone, rule, egress: true, verdict }) %}
 {%   endfor %}
        }

diff --git a/root/usr/share/firewall4/templates/zone-notrack.uc b/root/usr/share/firewall4/templates/zone-notrack.uc
index fe31eb2dc4a8bb57bde84b9bbab92a4b9ad89478..908692e29fabdad5525e695f3bdc5923cbd4a7f6 100644 (file)
--- a/root/usr/share/firewall4/templates/zone-notrack.uc
+++ b/root/usr/share/firewall4/templates/zone-notrack.uc
@@ -1,6 +1,6 @@
 {%+
-       local devs = fw4.filter_loopback_devs(fw4.devices_pos, output),
-             nets = fw4.filter_loopback_addrs(fw4.subnets_pos, output);
+       let devs = fw4.filter_loopback_devs(fw4.devices_pos, output),
+           nets = fw4.filter_loopback_addrs(fw4.subnets_pos, output);
 
        if (!((output && (length(devs) || length(nets))) ||
              (!output && (rule.devices_neg || rule.subnets_neg || length(devs) || length(nets)))))

diff --git a/root/usr/share/ucode/fw4.uc b/root/usr/share/ucode/fw4.uc
index b120ed49b47e1c3d84fc3d84276b91364a3f0eac..f0e180d764d79578760cd2f55ec513b23958080d 100644 (file)
--- a/root/usr/share/ucode/fw4.uc
+++ b/root/usr/share/ucode/fw4.uc
@@ -1648,7 +1648,7 @@ return {
                if (defs.synflood_protect === null)
                        defs.synflood_protect = defs.syn_flood;
 
-               delete(defs, "syn_flood");
+               delete defs.syn_flood;
 
                this.state.defaults = defs;
        },
@@ -2039,10 +2039,10 @@ return {
                        };
 
                        if (!length(r.icmp_types))
-                               delete(r, "icmp_types");
+                               delete r.icmp_types;
 
                        if (!length(r.icmp_codes))
-                               delete(r, "icmp_codes");
+                               delete r.icmp_codes;
 
                        if (r.set_mark) {
                                r.set_xmark = {
@@ -2051,7 +2051,7 @@ return {
                                        mask:   r.set_mark.mark | r.set_mark.mask
                                };
 
-                               delete(r, "set_mark");
+                               delete r.set_mark;
                        }
 
                        let set_types = map_setmatch(ipset, rule.ipset, proto.name);

diff --git a/tests/lib/mocklib/ubus.uc b/tests/lib/mocklib/ubus.uc
index b56f727f7d97e72d4ce3103431683a9d98c3876f..985e004a9d825ba157a6197835d2693b92804839 100644 (file)
--- a/tests/lib/mocklib/ubus.uc
+++ b/tests/lib/mocklib/ubus.uc
@@ -62,7 +62,7 @@
 
                error: function() {
                        let e = this._error;
-                       delete(this._error);
+                       delete this._error;
 
                        return e;
                }