Fix luacheck warnings

[etc/awesome.git] / luatz / tzfile.lua

diff --git a/luatz/tzfile.lua b/luatz/tzfile.lua
index a3fa7941171e5c5d188481a7aa6b7dd9fe7e9e72..2d64d369b0658b86cfd9ebfb625bbfc2cf0f70dc 100644 (file)
--- a/luatz/tzfile.lua
+++ b/luatz/tzfile.lua
@@ -1,30 +1,47 @@
 local tz_info_mt = require "luatz.tzinfo".tz_info_mt
 local tt_info_mt = require "luatz.tzinfo".tt_info_mt
 
+local read_int32be, read_int64be
+
+-- luacheck: push std max
+if string.unpack then
+       -- Only available in Lua 5.3+
+       function read_int32be(fd)
+               local data, err = fd:read(4)
+               if data == nil then return nil, err end
+               return string.unpack(">i4", data)
+       end
 
-local function read_int32be ( fd )
-       local data , err = fd:read ( 4 )
-       if data == nil then return nil , err end
-       local o1 , o2 , o3 , o4 = data:byte ( 1 , 4 )
-
-       local unsigned = o4 + o3*2^8 + o2*2^16 + o1*2^24
-       if unsigned >= 2^31 then
-               return unsigned - 2^32
-       else
-               return unsigned
+       function read_int64be(fd)
+               local data, err = fd:read(8)
+               if data == nil then return nil, err end
+               return string.unpack(">i8", data)
+       end
+else -- luacheck: pop
+       function read_int32be(fd)
+               local data, err = fd:read(4)
+               if data == nil then return nil, err end
+               local o1, o2, o3, o4 = data:byte(1, 4)
+
+               local unsigned = o4 + o3*2^8 + o2*2^16 + o1*2^24
+               if unsigned >= 2^31 then
+                       return unsigned - 2^32
+               else
+                       return unsigned
+               end
        end
-end
 
-local function read_int64be ( fd )
-       local data , err = fd:read ( 8 )
-       if data == nil then return nil , err end
-       local o1 , o2 , o3 , o4 , o5 , o6 , o7 , o8 = data:byte ( 1 , 8 )
+       function read_int64be(fd)
+               local data, err = fd:read(8)
+               if data == nil then return nil, err end
+               local o1, o2, o3, o4, o5, o6, o7, o8 = data:byte(1, 8)
 
-       local unsigned = o8 + o7*2^8 + o6*2^16 + o5*2^24 + o4*2^32 + o3*2^40 + o2*2^48 + o1*2^56
-       if unsigned >= 2^63 then
-               return unsigned - 2^64
-       else
-               return unsigned
+               local unsigned = o8 + o7*2^8 + o6*2^16 + o5*2^24 + o4*2^32 + o3*2^40 + o2*2^48 + o1*2^56
+               if unsigned >= 2^63 then
+                       return unsigned - 2^64
+               else
+                       return unsigned
+               end
        end
 end
 
@@ -43,7 +60,7 @@ local fifteen_nulls = ("\0"):rep(15)
 local function read_tz ( fd )
        assert ( fd:read(4) == "TZif" , "Invalid TZ file" )
        local version = assert ( fd:read(1) )
-       if version == "\0" or version == "2" then
+       if version == "\0" or version == "2" or version == "3" then
                local MIN_TIME = -2^32+1
 
                assert ( assert ( fd:read(15) ) == fifteen_nulls , "Expected 15 nulls" )
@@ -83,7 +100,7 @@ local function read_tz ( fd )
 
                local abbreviations = assert ( fd:read ( tzh_charcnt ) )
 
-               local leap_seconds = { }
+               local leap_seconds = { } -- luacheck: ignore 241
                for i=1, tzh_leapcnt do
                        leap_seconds [ i ] = {
                                offset = assert ( read_int32be ( fd ) ) ;
@@ -102,7 +119,8 @@ local function read_tz ( fd )
                        For version-2-format timezone files, the above header and data is followed by a second header and data,
                        identical in format except that eight bytes are used for each transition time or leap-second time.
                        ]]
-                       assert ( fd:read(5) == "TZif2" )
+                       assert(fd:read(4) == "TZif")
+                       assert(fd:read(1) == version)
                        assert ( assert ( fd:read(15) ) == fifteen_nulls , "Expected 15 nulls" )
 
                        MIN_TIME = -2^64+1
@@ -202,6 +220,7 @@ local function read_tz ( fd )
                end
 
                local res = {
+                       future = TZ;
                        [0] = {
                                transition_time = MIN_TIME ;
                                info = ttinfos [ first ] ;