From 4254d06d1fc062fc0d62ee403e8ac3ce0157888f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Fri, 11 Dec 2015 02:36:36 +0100
Subject: minor code refactoring


diff --git a/core.go b/core.go
new file mode 100644
index 0000000..5498499
--- /dev/null
+++ b/core.go
@@ -0,0 +1,43 @@
+//
+//  rhimportd
+//
+//  The Radio Helsinki Rivendell Import Daemon
+//
+//
+//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
+//
+//  This file is part of rhimportd.
+//
+//  rhimportd is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  any later version.
+//
+//  rhimportd is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
+//
+
+package rhimport
+
+import (
+	//	"io/ioutil"
+	"github.com/golang-basic/go-curl"
+	"log"
+	"os"
+)
+
+var (
+	rhl  = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags)
+	rhdl = log.New(os.Stderr, "[rhimport-dbg]\t", log.LstdFlags)
+	//rhdl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags)
+)
+
+func init() {
+	curl.GlobalInit(curl.GLOBAL_ALL)
+	fetcher_init()
+}
diff --git a/fetcher.go b/fetcher.go
index 03cf3da..ccbca43 100644
--- a/fetcher.go
+++ b/fetcher.go
@@ -150,9 +150,7 @@ var (
 	}
 )
 
-func init() {
-	curl.GlobalInit(curl.GLOBAL_ALL)
-
+func fetcher_init() {
 	info := curl.VersionInfo(curl.VERSION_FIRST)
 	protos := info.Protocols
 	for _, proto := range protos {
diff --git a/log.go b/log.go
deleted file mode 100644
index b192c30..0000000
--- a/log.go
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  rhimportd
-//
-//  The Radio Helsinki Rivendell Import Daemon
-//
-//
-//  Copyright (C) 2015 Christian Pointner <equinox@helsinki.at>
-//
-//  This file is part of rhimportd.
-//
-//  rhimportd is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  any later version.
-//
-//  rhimportd is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with rhimportd. If not, see <http://www.gnu.org/licenses/>.
-//
-
-package rhimport
-
-import (
-	//	"io/ioutil"
-	"log"
-	"os"
-)
-
-var (
-	rhl  = log.New(os.Stderr, "[rhimport]\t", log.LstdFlags)
-	rhdl = log.New(os.Stderr, "[rhimport-dbg]\t", log.LstdFlags)
-	//rhdl = log.New(ioutil.Discard, "[rhimport-dbg]\t", log.LstdFlags)
-)
-- 
cgit v0.10.2