Merge pull request #1748 from bobcanthelpyou/luacheck_warnings

treewide: fix luacheck warnings

package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua

@@ -57,7 +57,7 @@ local f_password = Form(translate("Password"), translate(
 )
 f_password.reset = false
 
-local s = f_password:section(Section)
+s = f_password:section(Section)
 
 local pw1 = s:option(Value, "pw1", translate("Password"))
 pw1.password = true

package/gluon-web-mesh-vpn-fastd/luasrc/lib/gluon/config-mode/model/admin/mesh_vpn_fastd.lua

@@ -22,18 +22,18 @@ function mode:write(data)
 
 	-- methods will be recreated and filled with the original values from site.mesh_vpn.fastd.methods
 	-- if performance mode was selected, and the method 'null' was not present in the original table, it will be added
-	local methods = {}
+	local site_methods = {}
 	if data == 'performance' then
-		table.insert(methods, 'null')
+		table.insert(site_methods, 'null')
 	end
 
 	for _, method in ipairs(site.mesh_vpn.fastd.methods()) do
 		if method ~= 'null' then
-			table.insert(methods, method)
+			table.insert(site_methods, method)
 		end
 	end
 
-	uci:set('fastd', 'mesh_vpn', 'method', methods)
+	uci:set('fastd', 'mesh_vpn', 'method', site_methods)
 
 	uci:save('fastd')
 	uci:commit('fastd')

package/gluon-web-model/luasrc/usr/lib/lua/gluon/web/model.lua

@@ -13,7 +13,7 @@ local function load(filename, i18n)
 	local func = assert(loadfile(filename))
 
 	setfenv(func, setmetatable({}, {__index =
-		function(tbl, key)
+		function(_, key)
 			return classes[key] or i18n[key] or _G[key]
 		end
 	}))

package/gluon-web-model/luasrc/usr/lib/lua/gluon/web/model/classes.lua

@@ -97,7 +97,7 @@ end
 function Node:resolve_depends()
 	local updated = false
 	for _, node in ipairs(self.children) do
-		update = updated or node:resolve_depends()
+		updated = updated or node:resolve_depends()
 	end
 	return updated
 end
@@ -145,7 +145,7 @@ function AbstractValue:depends(field, value)
 	table.insert(self.deps, deps)
 end
 
-function AbstractValue:deplist(section, deplist)
+function AbstractValue:deplist(_, deplist)
 	local deps = {}
 
 	for _, d in ipairs(deplist or self.deps) do
@@ -257,7 +257,8 @@ function AbstractValue:handle()
 	end
 end
 
-function AbstractValue:write(value)
+-- will be overridden: write(value)
+function AbstractValue:write()
 end
 
 

package/gluon-web-network/luasrc/lib/gluon/config-mode/model/admin/network.lua

@@ -42,7 +42,7 @@ ipv4_gateway.default = wan.gateway
 ipv4_gateway.datatype = "ip4addr"
 
 
-local s = f:section(Section)
+s = f:section(Section)
 
 local ipv6 = s:option(ListValue, "ipv6", translate("IPv6"))
 ipv6:value("dhcpv6", translate("Automatic (RA/DHCPv6)"))
@@ -61,7 +61,7 @@ ipv6_gateway.default = wan6.ip6gw
 ipv6_gateway.datatype = "ip6addr"
 
 if dns_static then
-	local s = f:section(Section)
+	s = f:section(Section)
 
 	local dns = s:option(DynamicList, "dns", translate("Static DNS servers"))
 	dns.default = uci:get_list("gluon-wan-dnsmasq", dns_static, "server")
@@ -74,7 +74,7 @@ if dns_static then
 	end
 end
 
-local s = f:section(Section)
+s = f:section(Section)
 
 local mesh_wan = s:option(Flag, "mesh_wan", translate("Enable meshing on the WAN interface"))
 mesh_wan.default = not uci:get_bool("network", "mesh_wan", "disabled")
@@ -84,7 +84,7 @@ function mesh_wan:write(data)
 end
 
 if sysconfig.lan_ifname then
-	local s = f:section(Section)
+	s = f:section(Section)
 
 	local mesh_lan = s:option(Flag, "mesh_lan", translate("Enable meshing on the LAN interface"))
 	mesh_lan.default = not uci:get_bool("network", "mesh_lan", "disabled")
@@ -107,24 +107,24 @@ if sysconfig.lan_ifname then
 end
 
 local section
-uci:foreach("system", "gpio_switch", function(s)
-	if s[".name"]:match("poe") then
+uci:foreach("system", "gpio_switch", function(si)
+	if si[".name"]:match("poe") then
 		if not section then
 			section = f:section(Section)
 		end
 
-		local port = s.name:match("^PoE Power Port(%d*)$")
+		local port = si.name:match("^PoE Power Port(%d*)$")
 		local name
 		if port then
 			name = translatef("Enable PoE Power Port %s", port)
 		else
-			name = translate("Enable " .. s.name)
+			name = translate("Enable " .. si.name)
 		end
-		local poe = section:option(Flag, s[".name"], name)
-		poe.default = uci:get_bool("system", s[".name"], "value")
+		local poe = section:option(Flag, si[".name"], name)
+		poe.default = uci:get_bool("system", si[".name"], "value")
 
 		function poe:write(data)
-			uci:set("system", s[".name"], "value", data)
+			uci:set("system", si[".name"], "value", data)
 		end
 	end
 end)

package/gluon-web-node-role/luasrc/lib/gluon/config-mode/model/admin/noderole.lua

@@ -17,8 +17,8 @@ s = f:section(Section, nil, translate(
 
 o = s:option(ListValue, "role", translate("Role"))
 o.default = role
-for _, role in ipairs(site.roles.list()) do
-	o:value(role, site_i18n.translate('gluon-web-node-role:role:' .. role))
+for _, role_value in ipairs(site.roles.list()) do
+	o:value(role, site_i18n.translate('gluon-web-node-role:role:' .. role_value))
 end
 
 function o:write(data)

package/gluon-web-wifi-config/luasrc/lib/gluon/config-mode/model/admin/wifi-config.lua

 local iwinfo = require 'iwinfo'
-local site = require 'gluon.site'
 local uci = require("simple-uci").cursor()
 local util = require 'gluon.util'
 
@@ -158,7 +157,7 @@ end
 
 function f:write()
 	uci:commit('gluon')
-	os.execute('/lib/gluon/upgrade/200-wireless') 
+	os.execute('/lib/gluon/upgrade/200-wireless')
 	uci:commit('wireless')
 end
 

package/gluon-web/luasrc/usr/lib/lua/gluon/web/dispatcher.lua

@@ -109,8 +109,8 @@ local function dispatch(config, http, request)
 					return _node({...})
 				end,
 
-				entry = function(path, target, title, order)
-					local c = _node(path, true)
+				entry = function(entry_path, target, title, order)
+					local c = _node(entry_path, true)
 
 					c.target = target
 					c.title  = title
@@ -204,7 +204,7 @@ return function(config, http)
 		table.insert(request, node)
 	end
 
-	ok, err = pcall(dispatch, config, http, request)
+	local ok, err = pcall(dispatch, config, http, request)
 	if not ok then
 		http:status(500, "Internal Server Error")
 		http:prepare_content("text/plain")

package/gluon-web/luasrc/usr/lib/lua/gluon/web/http.lua

@@ -53,7 +53,7 @@ end
 function Http:getcookie(name)
 	local c = string.gsub(";" .. (self:getenv("HTTP_COOKIE") or "") .. ";", "%s*;%s*", ";")
 	local p = ";" .. name .. "=(.-);"
-	local i, j, value = c:find(p)
+	local _, _, value = c:find(p)
 	return value and protocol.urldecode(value)
 end
 

package/gluon-web/luasrc/usr/lib/lua/gluon/web/http/protocol.lua

@@ -124,13 +124,13 @@ local function mimedecode_message_body(src, msg, filecb)
 	local store  = nil
 	local lchunk = nil
 
-	local function parse_headers(chunk, field)
+	local function parse_headers(chunk, pfield)
 		local stat
 		repeat
 			chunk, stat = chunk:gsub(
 				"^([A-Z][A-Za-z0-9%-_]+): +([^\r\n]+)\r\n",
 				function(k,v)
-					field.headers[k] = v
+					pfield.headers[k] = v
 					return ""
 				end
 			)
@@ -140,26 +140,26 @@ local function mimedecode_message_body(src, msg, filecb)
 
 		-- End of headers
 		if stat > 0 then
-			if field.headers["Content-Disposition"] then
-				if field.headers["Content-Disposition"]:match("^form%-data; ") then
-					field.name = field.headers["Content-Disposition"]:match('name="(.-)"')
-					field.file = field.headers["Content-Disposition"]:match('filename="(.+)"$')
+			if pfield.headers["Content-Disposition"] then
+				if pfield.headers["Content-Disposition"]:match("^form%-data; ") then
+					pfield.name = pfield.headers["Content-Disposition"]:match('name="(.-)"')
+					pfield.file = pfield.headers["Content-Disposition"]:match('filename="(.+)"$')
 				end
 			end
 
-			if not field.headers["Content-Type"] then
-				field.headers["Content-Type"] = "text/plain"
+			if not pfield.headers["Content-Type"] then
+				pfield.headers["Content-Type"] = "text/plain"
 			end
 
 
-			if field.name then
-				initval(msg.params, field.name)
-				if field.file then
-					appendval(msg.params, field.name, field.file)
+			if pfield.name then
+				initval(msg.params, pfield.name)
+				if pfield.file then
+					appendval(msg.params, pfield.name, pfield.file)
 					store = filecb
 				else
-					store = function(hdr, buf, eof)
-						appendval(msg.params, field.name, buf)
+					store = function(_, buf, _)
+						appendval(msg.params, pfield.name, buf)
 					end
 				end
 			else
@@ -197,6 +197,7 @@ local function mimedecode_message_body(src, msg, filecb)
 
 				if spos then
 					local predata = data:sub(1, spos - 1)
+					local eof
 
 					if inhdr then
 						predata, eof = parse_headers(predata, field)
@@ -225,11 +226,12 @@ local function mimedecode_message_body(src, msg, filecb)
 				-- We found at least some boundary. Save
 				-- the unparsed remaining data for the
 				-- next chunk.
-				lchunk, data = data, nil
+				lchunk = data
 			else
 				-- There was a complete chunk without a boundary. Parse it as headers or
 				-- append it as data, depending on our current state.
 				if inhdr then
+					local eof
 					lchunk, eof = parse_headers(data, field)
 					inhdr = not eof
 				else
@@ -240,7 +242,7 @@ local function mimedecode_message_body(src, msg, filecb)
 					if store then
 						store(field, lchunk, false)
 					end
-					lchunk, chunk = chunk, nil
+					lchunk = chunk
 				end
 			end
 		end

package/gluon-web/luasrc/usr/lib/lua/gluon/web/i18n.lua

@@ -13,7 +13,7 @@ return function(config)
 		return string.format('%s/%s.%s.lmo', i18ndir, pkg, lang)
 	end
 
-	local function no_translation(key)
+	local function no_translation()
 		return nil
 	end
 

package/gluon-web/luasrc/usr/lib/lua/gluon/web/template.lua

@@ -44,13 +44,13 @@ return function(config, env)
 			translate = t.translate,
 			translatef = t.translatef,
 			_translate = t._translate,
-			include = function(name)
-				ctx.render(name, scope, pkg)
+			include = function(include_name)
+				ctx.render(include_name, scope, pkg)
 			end,
 		}
 
 		setfenv(template, setmetatable({}, {
-			__index = function(tbl, key)
+			__index = function(_, key)
 				return scope[key] or locals[key] or env[key]
 			end
 		}))

scripts/check_site.lua

@@ -37,7 +37,7 @@ local site, domain_code, domain, conf
 local function merge(a, b)
 	local function is_array(t)
 		local n = 0
-		for k, v in pairs(t) do
+		for _ in pairs(t) do
 			n = n + 1
 		end
 		return n == #t
@@ -216,12 +216,12 @@ local function check_chanlist(channels)
 	return function(chanlist)
 		for group in chanlist:gmatch("%S+") do
 			if group:match("^%d+$") then
-				channel = tonumber(group)
+				local channel = tonumber(group)
 				if not is_valid_channel(channel) then
 					return false
 				end
 			elseif group:match("^%d+-%d+$") then
-				from, to = group:match("^(%d+)-(%d+)$")
+				local from, to = group:match("^(%d+)-(%d+)$")
 				from = tonumber(from)
 				to = tonumber(to)
 				if from >= to then
@@ -344,8 +344,9 @@ end
 
 function need_chanlist(path, channels, required)
 	local valid_chanlist = check_chanlist(channels)
-	return need(path, valid_chanlist, required, 'be a space-separated list of WiFi channels or channel-ranges (separated by a hyphen). ' .. 
-	'Valid channels are: ' .. array_to_string(channels))
+	return need(path, valid_chanlist, required,
+		'be a space-separated list of WiFi channels or channel-ranges (separated by a hyphen). '
+		.. 'Valid channels are: ' .. array_to_string(channels))
 end
 
 function need_domain_name(path)