From b712180b453626143a61c393016c15b3d70a1332 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 2 Oct 2024 15:50:05 +0200 Subject: [PATCH] cephfs: replace cephfsError by cephError Signed-off-by: Niels de Vos --- cephfs/errors.go | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/cephfs/errors.go b/cephfs/errors.go index b139229..ab28f09 100644 --- a/cephfs/errors.go +++ b/cephfs/errors.go @@ -11,23 +11,8 @@ import ( "github.com/ceph/go-ceph/internal/errutil" ) -// cephFSError represents an error condition returned from the CephFS APIs. -type cephFSError int - -// Error returns the error string for the cephFSError type. -func (e cephFSError) Error() string { - return errutil.FormatErrorCode("cephfs", int(e)) -} - -func (e cephFSError) ErrorCode() int { - return int(e) -} - func getError(e C.int) error { - if e == 0 { - return nil - } - return cephFSError(e) + return errutil.GetError("cephfs", int(e)) } // getErrorIfNegative converts a ceph return code to error if negative. @@ -46,22 +31,16 @@ var ( // ErrEmptyArgument may be returned if a function argument is passed // a zero-length slice or map. ErrEmptyArgument = errors.New("Argument must contain at least one item") -) -// Public CephFSErrors: - -const ( // ErrNotConnected may be returned when client is not connected // to a cluster. - ErrNotConnected = cephFSError(-C.ENOTCONN) + ErrNotConnected = getError(-C.ENOTCONN) // ErrNotExist indicates a non-specific missing resource. - ErrNotExist = cephFSError(-C.ENOENT) -) + ErrNotExist = getError(-C.ENOENT) -// Private errors: + // Private errors: -const ( - errInvalid = cephFSError(-C.EINVAL) - errNameTooLong = cephFSError(-C.ENAMETOOLONG) - errRange = cephFSError(-C.ERANGE) + errInvalid = getError(-C.EINVAL) + errNameTooLong = getError(-C.ENAMETOOLONG) + errRange = getError(-C.ERANGE) )