Incorporate better moreThanOne function

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
ipfs · May 16, 2016 · 94f1922 · 94f1922
1 parent 4993689
commit 94f1922
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/core/commands/files/files.go b/core/commands/files/files.go
@@ -127,23 +127,17 @@ Type: <type>`),
 	Type: Object{},
 }
 
+func moreThanOne(a, b, c bool) bool {
+	return a && b || b && c || a && c
+}
+
 func statGetFormatOptions(req cmds.Request) (string, error) {
 
 	hash, _, _ := req.Option("hash").Bool()
 	size, _, _ := req.Option("size").Bool()
 	formatSpecified := req.Option("format").Found()
 
-	count := 0
-	if hash {
-		count++
-	}
-	if size {
-		count++
-	}
-	if formatSpecified {
-		count++
-	}
-	if count > 1 {
+	if moreThanOne(hash, size, formatSpecified) {
 		return "", formatError
 	}