remove log, add error return value to ParseKanjiDic2

gojp · Feb 22, 2014 · b77eae0 · b77eae0
1 parent 6b6d88b
commit b77eae0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/kanjidic2.go b/kanjidic2.go
@@ -2,7 +2,6 @@ package kanjidic2
 
 import (
 	"encoding/xml"
-	"log"
 	"os"
 )
 
@@ -57,10 +56,10 @@ type Kanji struct {
 	Nanori      []string   `xml:"nanori"`
 }
 
-func ParseKanjiDic2(filename string) (kanjiList []Kanji) {
+func ParseKanjiDic2(filename string) (kanjiList []Kanji, err error) {
 	xmlFile, err := os.Open(filename)
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 	defer xmlFile.Close()
 	decoder := xml.NewDecoder(xmlFile)