Skip to content

Commit 3f9067e

Browse files
committed
Fix registering function
1 parent 9a99fc2 commit 3f9067e

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import "github.com/ebitengine/purego"
1212
func main() {}
1313

1414
var libraryHandle unsafe.Pointer = nil
15-
var libraryHandlePure uintptr = nil
15+
var libraryHandlePure uintptr = 0
1616
var libraryPID int = -1
1717
var libraryPIDPure int = -1
1818

@@ -31,17 +31,17 @@ func getDynamicLibrary() unsafe.Pointer {
3131
}
3232

3333
func getDynamicLibraryPure() {
34-
if libraryHandlePure == nil || libraryPIDPure == -1 || libraryPIDPure != os.Getpid() {
35-
if libraryHandlePure != nil {
34+
if libraryHandlePure == 0 || libraryPIDPure == -1 || libraryPIDPure != os.Getpid() {
35+
if libraryHandlePure != 0 {
3636
purego.Dlclose(libraryHandlePure)
3737
}
3838
libraryHandlePure, _ = purego.Dlopen(os.Getenv("PKCS11_SUBMODULE"), purego.RTLD_NOW|purego.RTLD_GLOBAL)
39-
if libraryHandlePure == nil {
40-
return nil
39+
if libraryHandlePure == 0 {
40+
return 0
4141
}
4242
libraryPIDPure = os.Getpid()
4343
}
44-
return nil
44+
return 0
4545
}
4646

4747
func getDynamicLibrarySymbol(functionName string) any {
@@ -54,7 +54,7 @@ func getDynamicLibrarySymbol(functionName string) any {
5454

5555
func registerDynamicLibrarySymbolPure(function any, functionName string) any {
5656
lh := getDynamicLibraryPure()
57-
if lh == nil {
57+
if lh == 0 {
5858
return nil
5959
}
6060
purego.RegisterLibFunc(&function, lh, functionName)
@@ -64,8 +64,8 @@ func registerDynamicLibrarySymbolPure(function any, functionName string) any {
6464
//export C_CancelFunction
6565
func C_CancelFunction(hSession C.CK_SESSION_HANDLE) C.CK_RV { // Since v1.0
6666
var function func(C.CK_SESSION_HANDLE) C.CK_RV
67-
function = registerDynamicLibrarySymbolPure("C_CancelFunction")
68-
if function == nil {
67+
functionRV := registerDynamicLibrarySymbolPure(function,"C_CancelFunction")
68+
if functionRV == nil {
6969
fmt.Println("Failed getting symbol for this function.")
7070
return C.CKR_FUNCTION_NOT_SUPPORTED
7171
}

0 commit comments

Comments
 (0)