From 7e4494256a08f585523e01b1bbc51f41ff4e2b95 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Mon, 26 Sep 2022 14:50:22 +0200 Subject: Refactor: Errors into custom export types and expose types --- exports/servers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'exports/servers.go') diff --git a/exports/servers.go b/exports/servers.go index a487176..a399db7 100644 --- a/exports/servers.go +++ b/exports/servers.go @@ -3,6 +3,7 @@ package main /* // for free and size_t #include +#include "error.h" // The struct for a single server profile typedef struct serverProfile { @@ -293,11 +294,11 @@ func getSavedServersWithOptions(state *eduvpn.VPNState, servers *server.Servers) //export GetSavedServers // This function takes the name as input which is the name of the client // It gets the state by name and then returns the saved servers as a c struct belonging to it -func GetSavedServers(name *C.char) (*C.servers, *C.char) { +func GetSavedServers(name *C.char) (*C.servers, *C.error) { nameStr := C.GoString(name) state, stateErr := GetVPNState(nameStr) if stateErr != nil { - return nil, C.CString(ErrorToString(stateErr)) + return nil, getError(stateErr) } servers := getSavedServersWithOptions(state, &state.Servers) return servers, nil -- cgit v1.2.3