Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

List wraps the error from secretservice_linux.c. #191

Merged
merged 1 commit into from Aug 31, 2021

Conversation

QiWang19
Copy link
Contributor

List wraps the error from secretservice_linux.c so the List can give the caller more useful error message for diagnosing.

Signed-off-by: Qi Wang qiwan@redhat.com

@@ -96,7 +96,8 @@ func (h Secretservice) List() (map[string]string, error) {
defer C.freeListData(&acctsC, listLenC)
if err != nil {
defer C.g_error_free(err)
return nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library")
errMsg := (*C.char)(unsafe.Pointer(err.message))
return nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library" + ": " + C.GoString(errMsg))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just do return errors.New(C.GoString(errMsg)) like

return errors.New(C.GoString(errMsg))
and
return errors.New(C.GoString(errMsg))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ebriney Fixed, thanks!

List wraps the error from secretservice_linux.c so the List can give the caller more useful error message for diagnosing.

Signed-off-by: Qi Wang <qiwan@redhat.com>
Copy link
Member

@ebriney ebriney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ebriney ebriney merged commit 6e2a858 into docker:master Aug 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants