diff --git a/util.go b/util.go index 2a08074bc..d08ed4621 100644 --- a/util.go +++ b/util.go @@ -174,10 +174,7 @@ func parseSizeInBytes(sizeStr string) uint { } } - size := cast.ToInt(sizeStr) - if size < 0 { - size = 0 - } + size := max(cast.ToInt(sizeStr), 0) return safeMul(uint(size), multiplier) } diff --git a/viper.go b/viper.go index e4bdda042..26daf171e 100644 --- a/viper.go +++ b/viper.go @@ -637,7 +637,7 @@ func (v *Viper) isPathShadowedInDeepMap(path []string, m map[string]any) string // "foo.bar.baz" in a lower-priority map func (v *Viper) isPathShadowedInFlatMap(path []string, mi any) string { // unify input map - var m map[string]interface{} + var m map[string]any switch miv := mi.(type) { case map[string]string: m = castMapStringToMapInterface(miv) @@ -1001,8 +1001,8 @@ func stringToWeakSliceHookFunc(sep string) mapstructure.DecodeHookFunc { return func( f reflect.Type, t reflect.Type, - data interface{}, - ) (interface{}, error) { + data any, + ) (any, error) { if f.Kind() != reflect.String || t.Kind() != reflect.Slice { return data, nil }