textfile collector: updating utfbom dependency and simplifying code

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
This commit is contained in:
Dave Henderson
2018-12-12 12:30:25 -05:00
parent f4e5bc3d29
commit 5f9dfcc378
3 changed files with 23 additions and 15 deletions

View File

@@ -288,19 +288,9 @@ fileLoop:
}
func checkBOM(encoding utfbom.Encoding) error {
bom := ""
switch encoding {
case utfbom.Unknown, utfbom.UTF8:
if encoding == utfbom.Unknown || encoding == utfbom.UTF8 {
return nil
case utfbom.UTF16BigEndian:
bom = "UTF16BigEndian"
case utfbom.UTF16LittleEndian:
bom = "UTF16LittleEndian"
case utfbom.UTF32BigEndian:
bom = "UTF32BigEndian"
case utfbom.UTF32LittleEndian:
bom = "UTF32LittleEndian"
}
return fmt.Errorf(bom)
return fmt.Errorf(encoding.String())
}