net.websocket.frames, util.datetime, util.json, util.prosodyctl, util.rfc6724: Remove...

diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua
index 737f46bbffedb2e7aa0f9d077eda720f7106a8fe..5fe96d4564b9fa590244cc5c6267d2f682de3e82 100644 (file)
--- a/net/websocket/frames.lua
+++ b/net/websocket/frames.lua
@@ -7,7 +7,6 @@
 --
 
 local softreq = require "util.dependencies".softreq;
-local log = require "util.logger".init "websocket.frames";
 local random_bytes = require "util.random".bytes;
 
 local bit = assert(softreq"bit" or softreq"bit32",

diff --git a/util/datetime.lua b/util/datetime.lua
index 27f28ace7eff560c5b3c7efc1caa0bbc880809e8..abb4e867b2aaa51ef2c254a963dcdc019ac69310 100644 (file)
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -12,7 +12,6 @@
 local os_date = os.date;
 local os_time = os.time;
 local os_difftime = os.difftime;
-local error = error;
 local tonumber = tonumber;
 
 local _ENV = nil;

diff --git a/util/json.lua b/util/json.lua
index 2c598446bab233d05825b7926bd21a7bd29d7b19..ec6b67def8902b2a11eb31b5955a737d917a1106 100644 (file)
--- a/util/json.lua
+++ b/util/json.lua
@@ -12,7 +12,6 @@ local s_char = string.char;
 local tostring, tonumber = tostring, tonumber;
 local pairs, ipairs = pairs, ipairs;
 local next = next;
-local error = error;
 local getmetatable, setmetatable = getmetatable, setmetatable;
 local print = print;
 

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index f8f2864412d48bd83dfd60b69c806e9cb287bfc5..207b37630bef299d5be0d1124aeb33c40f27c03e 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -22,7 +22,7 @@ local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
 local io, os = io, os;
 local print = print;
-local tostring, tonumber = tostring, tonumber;
+local tonumber = tonumber;
 
 local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
 

diff --git a/util/rfc6724.lua b/util/rfc6724.lua
index c8aec631ae4af2478b0eb08b4ddaf5b3098d873e..81f78d55f764bb14c227231fe25f7bae4124108d 100644 (file)
--- a/util/rfc6724.lua
+++ b/util/rfc6724.lua
@@ -10,7 +10,6 @@
 -- We can't hand this off to getaddrinfo, since it blocks
 
 local ip_commonPrefixLength = require"util.ip".commonPrefixLength
-local new_ip = require"util.ip".new_ip;
 
 local function commonPrefixLength(ipA, ipB)
        local len = ip_commonPrefixLength(ipA, ipB);