Update vendor of buildah and containers/common

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

1 files changed, 11 insertions, 50 deletions

diff --git a/vendor/github.com/xeipuuv/gojsonschema/utils.go b/vendor/github.com/xeipuuv/gojsonschema/utils.go
index 88d223fbf..a17d22e3b 100644
--- a/vendor/github.com/xeipuuv/gojsonschema/utils.go
+++ b/vendor/github.com/xeipuuv/gojsonschema/utils.go
@@ -27,15 +27,13 @@ package gojsonschema
 
 import (
 	"encoding/json"
-	"fmt"
-	"math"
 	"math/big"
 	"reflect"
 )
 
 func isKind(what interface{}, kinds ...reflect.Kind) bool {
 	target := what
-	if isJsonNumber(what) {
+	if isJSONNumber(what) {
 		// JSON Numbers are strings!
 		target = *mustBeNumber(what)
 	}
@@ -72,7 +70,7 @@ func indexStringInSlice(s []string, what string) int {
 	return -1
 }
 
-func marshalToJsonString(value interface{}) (*string, error) {
+func marshalToJSONString(value interface{}) (*string, error) {
 
 	mBytes, err := json.Marshal(value)
 	if err != nil {
@@ -90,7 +88,7 @@ func marshalWithoutNumber(value interface{}) (*string, error) {
 	// One way to eliminate these differences is to decode and encode the JSON one more time without Decoder.UseNumber
 	// so that these differences in representation are removed
 
-	jsonString, err := marshalToJsonString(value)
+	jsonString, err := marshalToJSONString(value)
 	if err != nil {
 		return nil, err
 	}
@@ -102,10 +100,10 @@ func marshalWithoutNumber(value interface{}) (*string, error) {
 		return nil, err
 	}
 
-	return marshalToJsonString(document)
+	return marshalToJSONString(document)
 }
 
-func isJsonNumber(what interface{}) bool {
+func isJSONNumber(what interface{}) bool {
 
 	switch what.(type) {
 
@@ -116,7 +114,7 @@ func isJsonNumber(what interface{}) bool {
 	return false
 }
 
-func checkJsonInteger(what interface{}) (isInt bool) {
+func checkJSONInteger(what interface{}) (isInt bool) {
 
 	jsonNumber := what.(json.Number)
 
@@ -128,26 +126,17 @@ func checkJsonInteger(what interface{}) (isInt bool) {
 
 // same as ECMA Number.MAX_SAFE_INTEGER and Number.MIN_SAFE_INTEGER
 const (
-	max_json_float = float64(1<<53 - 1)  // 9007199254740991.0 	 2^53 - 1
-	min_json_float = -float64(1<<53 - 1) //-9007199254740991.0	-2^53 - 1
+	maxJSONFloat = float64(1<<53 - 1)  // 9007199254740991.0 	 2^53 - 1
+	minJSONFloat = -float64(1<<53 - 1) //-9007199254740991.0	-2^53 - 1
 )
 
-func isFloat64AnInteger(f float64) bool {
-
-	if math.IsNaN(f) || math.IsInf(f, 0) || f < min_json_float || f > max_json_float {
-		return false
-	}
-
-	return f == float64(int64(f)) || f == float64(uint64(f))
-}
-
 func mustBeInteger(what interface{}) *int {
 
-	if isJsonNumber(what) {
+	if isJSONNumber(what) {
 
 		number := what.(json.Number)
 
-		isInt := checkJsonInteger(number)
+		isInt := checkJSONInteger(number)
 
 		if isInt {
 
@@ -158,9 +147,6 @@ func mustBeInteger(what interface{}) *int {
 
 			int32Value := int(int64Value)
 			return &int32Value
-
-		} else {
-			return nil
 		}
 
 	}
@@ -170,43 +156,18 @@ func mustBeInteger(what interface{}) *int {
 
 func mustBeNumber(what interface{}) *big.Rat {
 
-	if isJsonNumber(what) {
+	if isJSONNumber(what) {
 		number := what.(json.Number)
 		float64Value, success := new(big.Rat).SetString(string(number))
 		if success {
 			return float64Value
-		} else {
-			return nil
 		}
-
 	}
 
 	return nil
 
 }
 
-// formats a number so that it is displayed as the smallest string possible
-func resultErrorFormatJsonNumber(n json.Number) string {
-
-	if int64Value, err := n.Int64(); err == nil {
-		return fmt.Sprintf("%d", int64Value)
-	}
-
-	float64Value, _ := n.Float64()
-
-	return fmt.Sprintf("%g", float64Value)
-}
-
-// formats a number so that it is displayed as the smallest string possible
-func resultErrorFormatNumber(n float64) string {
-
-	if isFloat64AnInteger(n) {
-		return fmt.Sprintf("%d", int64(n))
-	}
-
-	return fmt.Sprintf("%g", n)
-}
-
 func convertDocumentNode(val interface{}) interface{} {
 
 	if lval, ok := val.([]interface{}); ok {