浏览代码

pkg/units: Unit constants directly int64

int64 seems sufficient

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Francisco Carriedo 11 年之前
父节点
当前提交
c7a2e86b51
共有 1 个文件被更改,包括 12 次插入14 次删除
  1. 12 14
      pkg/units/size.go

+ 12 - 14
pkg/units/size.go

@@ -7,26 +7,24 @@ import (
 	"strings"
 	"strings"
 )
 )
 
 
-type unit int64
-
 // See: http://en.wikipedia.org/wiki/Binary_prefix
 // See: http://en.wikipedia.org/wiki/Binary_prefix
 const (
 const (
 	// Decimal
 	// Decimal
-	KB unit = 1000
-	MB      = 1000 * KB
-	GB      = 1000 * MB
-	TB      = 1000 * GB
-	PB      = 1000 * TB
+	KB = 1000
+	MB = 1000 * KB
+	GB = 1000 * MB
+	TB = 1000 * GB
+	PB = 1000 * TB
 
 
 	// Binary
 	// Binary
-	KiB unit = 1024
-	MiB      = 1024 * KiB
-	GiB      = 1024 * MiB
-	TiB      = 1024 * GiB
-	PiB      = 1024 * TiB
+	KiB = 1024
+	MiB = 1024 * KiB
+	GiB = 1024 * MiB
+	TiB = 1024 * GiB
+	PiB = 1024 * TiB
 )
 )
 
 
-type unitMap map[string]unit
+type unitMap map[string]int64
 
 
 var (
 var (
 	decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
 	decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
@@ -81,7 +79,7 @@ func parseSize(sizeStr string, uMap unitMap) (int64, error) {
 
 
 	unitPrefix := strings.ToLower(matches[2])
 	unitPrefix := strings.ToLower(matches[2])
 	if mul, ok := uMap[unitPrefix]; ok {
 	if mul, ok := uMap[unitPrefix]; ok {
-		size *= int64(mul)
+		size *= mul
 	}
 	}
 
 
 	return size, nil
 	return size, nil