diff options
| author | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-11-28 11:52:04 +0100 |
|---|---|---|
| committer | jwijenbergh <jeroenwijenbergh@protonmail.com> | 2022-11-28 12:03:16 +0100 |
| commit | 7339e77c6eda5b96874dfc099d5c58da8ed53629 (patch) | |
| tree | b602159b0c397cbaa4f8983aea987274163fe357 /exports | |
| parent | e9f8db8ee8fccf60e58deb1d72766f94a053bb16 (diff) | |
Refactor: Remove most get prefixes for receiver functions
Diffstat (limited to 'exports')
| -rw-r--r-- | exports/exports.go | 6 | ||||
| -rw-r--r-- | exports/servers.go | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/exports/exports.go b/exports/exports.go index fb972fc..124a3a5 100644 --- a/exports/exports.go +++ b/exports/exports.go @@ -141,9 +141,9 @@ func getError(err error) *C.error { errorStruct := (*C.error)( C.malloc(C.size_t(unsafe.Sizeof(C.error{}))), ) - errorStruct.level = C.errorLevel(types.GetErrorLevel(err)) - errorStruct.traceback = C.CString(types.GetErrorTraceback(err)) - errorStruct.cause = C.CString(types.GetErrorCause(err).Error()) + errorStruct.level = C.errorLevel(types.ErrorLevel(err)) + errorStruct.traceback = C.CString(types.ErrorTraceback(err)) + errorStruct.cause = C.CString(types.ErrorCause(err).Error()) return errorStruct } diff --git a/exports/servers.go b/exports/servers.go index 0c3cc5f..d31fa44 100644 --- a/exports/servers.go +++ b/exports/servers.go @@ -189,7 +189,7 @@ func getCPtrServer(state *client.Client, base *client.ServerBase) *C.server { locationsStruct.total_locations, locationsStruct.locations = getCPtrListStrings(locations) cServer.locations = locationsStruct - profiles := base.GetValidProfiles(state.SupportsWireguard) + profiles := base.ValidProfiles(state.SupportsWireguard) cServer.profiles = getCPtrProfiles(&profiles) // No endtime is given if we get servers when it has been partially initialised if base.EndTime.IsZero() { @@ -232,7 +232,7 @@ func getCPtrServers( servers := (*[1<<30 - 1]*C.server)(unsafe.Pointer(serversPtr))[:totalServers:totalServers] index := 0 for _, currentServer := range serverMap { - cServer := getCPtrServer(state, ¤tServer.Base) + cServer := getCPtrServer(state, ¤tServer.Basic) servers[index] = cServer index += 1 } @@ -282,7 +282,7 @@ func getSavedServersWithOptions(state *client.Client, servers *server.Servers) * totalCustom, customPtr := getCPtrServers(state, servers.CustomServers.Map) totalInstitute, institutePtr := getCPtrServers(state, servers.InstituteServers.Map) var secureServerPtr *C.server = nil - secureInternetBase, secureInternetBaseErr := servers.SecureInternetHomeServer.GetBase() + secureInternetBase, secureInternetBaseErr := servers.SecureInternetHomeServer.Base() if secureInternetBaseErr == nil && secureInternetBase != nil { // FIXME: log error? secureServerPtr = getCPtrServer(state, secureInternetBase) @@ -328,7 +328,7 @@ func GetCurrentServer(name *C.char) (*C.server, *C.error) { if serverErr != nil { return nil, getError(serverErr) } - base, baseErr := server.GetBase() + base, baseErr := server.Base() if baseErr != nil { return nil, getError(baseErr) } @@ -369,7 +369,7 @@ func getTransitionProfiles(data interface{}) *C.serverProfiles { func getTransitionServer(state *client.Client, data interface{}) *C.server { if server, ok := data.(server.Server); ok { - base, baseErr := server.GetBase() + base, baseErr := server.Base() if baseErr != nil { // TODO: LOG return nil |