From 8e65e677bb678de920ea55097b8889b4245c0e15 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Mon, 4 Nov 2013 20:45:27 +0100
Subject: [db] stop exposing the global index object

---
 luaotfload-tool.lua | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'luaotfload-tool.lua')

diff --git a/luaotfload-tool.lua b/luaotfload-tool.lua
index ab1d4d9..7c2beda 100755
--- a/luaotfload-tool.lua
+++ b/luaotfload-tool.lua
@@ -677,7 +677,7 @@ The font info knows two levels of detail:
 --doc]]--
 
 local show_font_info = function (basename, askedname, detail, warnings)
-    local filenames = names.data.filenames
+    local filenames = names.data().filenames
     local index     = filenames.base[basename]
     local fullname  = filenames.full[index]
     askedname = sanitize_fontname (askedname)
@@ -775,7 +775,7 @@ actions.generate = function (job)
     fontnames = names.update(fontnames, job.force_reload, job.dry_run)
     logs.names_report("info", 2, "db",
         "Fonts in the database: %i", #fontnames.mappings)
-    if names.data then
+    if names.data() then
         return true, true
     end
     return false, false
@@ -933,8 +933,9 @@ local splitcomma = names.patterns.splitcomma
 
 actions.list = function (job)
     local criterion     = job.criterion
-
     local asked_fields  = job.asked_fields
+    local name_index    = names.data ()
+
     if asked_fields then
         asked_fields = lpegmatch(splitcomma, asked_fields)
     else
@@ -942,11 +943,11 @@ actions.list = function (job)
         asked_fields = { "fullname", "version", }
     end
 
-    if not names.data then
-        names.data = names.load()
+    if not name_index then
+        name_index = names.load()
     end
 
-    local mappings  = names.data.mappings
+    local mappings  = name_index.mappings
     local nmappings = #mappings
 
     if criterion == "*" then
-- 
cgit v1.2.3