From 44d69502bc715b8485f5d1888320e2558ece06d2 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 9 Dec 2021 09:16:32 +0100 Subject: [PATCH] rbd: export HexStringToInteger() HexStringToInteger() used to return a uint64, but everywhere else uint is used. Having HexStringToInteger() return a uint as well makes it a little easier to use when setting it with SetGlobalInt(). Signed-off-by: Niels de Vos --- internal/rbd/rbd_util.go | 8 ++++---- internal/rbd/rbd_util_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 471e1b7d0..542f84e15 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -250,8 +250,8 @@ func GetKrbdSupportedFeatures() (string, error) { return strings.TrimSuffix(string(val), "\n"), nil } -// hexStringToInteger convert hex value to uint. -func hexStringToInteger(hexString string) (uint64, error) { +// HexStringToInteger convert hex value to uint. +func HexStringToInteger(hexString string) (uint, error) { // trim 0x prefix numberStr := strings.TrimPrefix(strings.ToLower(hexString), "0x") @@ -262,7 +262,7 @@ func hexStringToInteger(hexString string) (uint64, error) { return 0, err } - return output, nil + return uint(output), nil } // isKrbdFeatureSupported checks if a given Image Feature is supported by krbd @@ -274,7 +274,7 @@ func isKrbdFeatureSupported(ctx context.Context, imageFeatures string) bool { supported := true for _, featureName := range imageFeatureSet.Names() { - if (uint64(librbd.FeatureSetFromNames(strings.Split(featureName, " "))) & krbdFeatures) == 0 { + if (uint(librbd.FeatureSetFromNames(strings.Split(featureName, " "))) & krbdFeatures) == 0 { supported = false log.ErrorLog(ctx, "krbd feature %q not supported", featureName) diff --git a/internal/rbd/rbd_util_test.go b/internal/rbd/rbd_util_test.go index 331eb693d..2174ca2ea 100644 --- a/internal/rbd/rbd_util_test.go +++ b/internal/rbd/rbd_util_test.go @@ -334,9 +334,9 @@ func TestIsKrbdFeatureSupported(t *testing.T) { t.Parallel() var err error krbdSupportedFeaturesAttr := "0x1" - krbdFeatures, err = hexStringToInteger(krbdSupportedFeaturesAttr) // initialize krbdFeatures + krbdFeatures, err = HexStringToInteger(krbdSupportedFeaturesAttr) // initialize krbdFeatures if err != nil { - t.Errorf("hexStringToInteger(%s) failed", krbdSupportedFeaturesAttr) + t.Errorf("HexStringToInteger(%s) failed", krbdSupportedFeaturesAttr) } supported := isKrbdFeatureSupported(ctx, tc.featureName) if supported != tc.isSupported {