]> git.madduck.net Git - etc/awesome.git/blobdiff - luatz/parse.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

README,rockspec: Fix typo (stftime => strftime)
[etc/awesome.git] / luatz / parse.lua
index a1a0431c5006f5f9b44f8216f354ea273402af0f..0bfd820fb477b56def6838be54ab072d1ffcc1a7 100644 (file)
@@ -8,7 +8,7 @@ local new_timetable = require "luatz.timetable".new
 local function rfc_3339 ( str , init )
        local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
        if not year then
-               error ( "Invalid RFC 3339 timestamp" )
+               return nil, "Invalid RFC 3339 timestamp"
        end
        year  = tonumber ( year )
        month = tonumber ( month )
@@ -25,9 +25,9 @@ local function rfc_3339 ( str , init )
        else
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
-                       tz_offset = tonumber ( hour_offset )*60 + tonumber ( min_offset )
-               else
-                       -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min
+                       tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60
+               else -- luacheck: ignore 542
+                       -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min)
                        -- tz_offset will be nil
                end
        end