shapelib: Load from Vec<Config1> rather than config()

This makes this function not tied to Config, which will be more
suitable for otterlib.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/main.rs b/daemon/main.rs
index e8bf5ba61f25064841cb7ac27e78772f3b95586c..505b17f473710294db31d8b5bdc2463d12e33637 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -269,7 +269,7 @@ fn main() {
   }
 
   nwtemplates::init()?;
-  shapelib::load()?;
+  shapelib::load(&config().shapelibs)?;
 
   c.lock_save_area()?;
   load_accounts()?;

diff --git a/src/shapelib.rs b/src/shapelib.rs
index df4054b3eab0fd66006f5b7d26908f9c7f1fa78f..3760e7ae7d24b43f795181705f3b83df0133f8a7 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -504,8 +504,8 @@ impl Config1 {
 }
 
 #[throws(LibraryLoadError)]
-pub fn load() {
-  for l in &config().shapelibs {
+pub fn load(libs: &Vec<Config1>) {
+  for l in libs {
     let libs = l.resolve()?;
     let n = libs.len();
     for e in libs {