From 96a8e557d3bb9b887dd7d504a4c20f05a87e6cbe Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Sat, 13 Mar 2010 02:11:41 +0100
Subject: Make use of io.lines() where appropriate

---
 cpuinf.lua | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'cpuinf.lua')

diff --git a/cpuinf.lua b/cpuinf.lua
index 2d99356..3604dee 100644
--- a/cpuinf.lua
+++ b/cpuinf.lua
@@ -5,7 +5,7 @@
 
 -- {{{ Grab environment
 local tonumber = tonumber
-local io = { open = io.open }
+local io = { lines = io.lines }
 local setmetatable = setmetatable
 local string = { match = string.match }
 -- }}}
@@ -17,12 +17,11 @@ module("vicious.cpuinf")
 
 -- {{{ CPU Information widget type
 local function worker(format)
-    -- Get cpuinfo
-    local f = io.open("/proc/cpuinfo")
     local cpu_id   = nil
     local cpu_info = {}
 
-    for line in f:lines() do
+    -- Get CPU info
+    for line in io.lines("/proc/cpuinfo") do
         if string.match(line, "^processor.*") then
             cpu_id = string.match(line, "([%d]+)")
         elseif string.match(line, "^cpu MHz.*") then
@@ -35,7 +34,6 @@ local function worker(format)
             cpu_info["{cpu"..cpu_id.." mb}"] = cpu_cache / 1024
         end
     end
-    f:close()
 
     return cpu_info
 end
-- 
cgit v1.2.3