simplify report.MakeFromFile

this new version is less efficient... but not for much longer
weaveworks · Nov 29, 2017 · cdbc01e · cdbc01e
1 parent ecf3ae9
commit cdbc01e
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/report/marshal.go b/report/marshal.go
@@ -139,21 +139,7 @@ func MakeFromFile(path string) (rpt Report, _ error) {
 		return rpt, err
 	}
 
-	var buf []byte
-	if gzipped {
-		r, err := gzip.NewReader(f)
-		if err != nil {
-			return rpt, err
-		}
-		buf, err = ioutil.ReadAll(r)
-	} else {
-		buf, err = ioutil.ReadAll(f)
-	}
-	if err != nil {
-		return rpt, err
-	}
-	err = rpt.ReadBytes(buf, handle)
-
+	err = rpt.ReadBinary(f, gzipped, handle)
 	return rpt, err
 }