List wraps the error from secretservice_linux.c.

QiWang19 · QiWang19 · commit 8086f00d7d26 · 2021-08-28T20:44:52.000-04:00
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 &lt;qiwan@redhat.com&gt;
diff --git a/secretservice/secretservice_linux.go b/secretservice/secretservice_linux.go
@@ -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 errors.New(C.GoString(errMsg))
 	}
 
 	resp := make(map[string]string)

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ func (h Secretservice) List() (map[string]string, error) {`
`96`	`96`	`defer C.freeListData(&acctsC, listLenC)`
`97`	`97`	`if err != nil {`
`98`	`98`	`defer C.g_error_free(err)`
`99`		`- return nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library")`
	`99`	`+ errMsg := (*C.char)(unsafe.Pointer(err.message))`
	`100`	`+ return errors.New(C.GoString(errMsg))`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`resp := make(map[string]string)`