gzip-util.go: fixed error definitions
This commit is contained in:
parent
ba6a34f0e9
commit
bf4e35ea0d
12
gzip-util.go
12
gzip-util.go
@ -15,9 +15,9 @@ import (
|
|||||||
const GZIP_SUFFIX = ".gz"
|
const GZIP_SUFFIX = ".gz"
|
||||||
|
|
||||||
func CreateGzipReader(in io.Reader) (reader *bufio.Reader, err error) {
|
func CreateGzipReader(in io.Reader) (reader *bufio.Reader, err error) {
|
||||||
inflate, err := gzip.NewReader(in)
|
var inflate *gzip.Reader
|
||||||
if err != nil {
|
if inflate, err = gzip.NewReader(in); err != nil {
|
||||||
fmt.Errorf("Can't inflate gzipped input stream: %v", err)
|
err = fmt.Errorf("can't inflate gzipped input stream: %v", err)
|
||||||
} else {
|
} else {
|
||||||
reader = bufio.NewReader(inflate)
|
reader = bufio.NewReader(inflate)
|
||||||
}
|
}
|
||||||
@ -25,10 +25,10 @@ func CreateGzipReader(in io.Reader) (reader *bufio.Reader, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func CreateGzipFile(in io.Reader, fileName string) (reader *bufio.Reader, err error) {
|
func CreateGzipFile(in io.Reader, fileName string) (reader *bufio.Reader, err error) {
|
||||||
|
var inflate *gzip.Reader
|
||||||
if len(fileName) > 0 && strings.HasSuffix(fileName, GZIP_SUFFIX) {
|
if len(fileName) > 0 && strings.HasSuffix(fileName, GZIP_SUFFIX) {
|
||||||
inflate, err := gzip.NewReader(in)
|
if inflate, err = gzip.NewReader(in); err != nil {
|
||||||
if err != nil {
|
err = fmt.Errorf("can't inflate gzipped input stream %#v: %v", fileName, err)
|
||||||
fmt.Errorf("Can't inflate gzipped input stream %#v: %v", fileName, err)
|
|
||||||
} else {
|
} else {
|
||||||
reader = bufio.NewReader(inflate)
|
reader = bufio.NewReader(inflate)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user