...

2 files changed, 8 insertions, 9 deletions

diff --git a/salticidae b/salticidae
-Subproject f7050c145e81a70be85bb0287044abdfa7ba444
+Subproject 0f3b3ed832db7062c805e82a9605b777595e340
diff --git a/test_msgnet/main.go b/test_msgnet/main.go
index a92556f..b768adf 100644
--- a/test_msgnet/main.go
+++ b/test_msgnet/main.go
@@ -9,7 +9,6 @@ package main
 import "C"
 
 import (
-    "unsafe"
     "encoding/binary"
     "fmt"
     "salticidae-go"
@@ -130,13 +129,13 @@ func main() {
     alice = genMyNet(ec, "Alice")
     bob = genMyNet(ec, "Bob")
 
-    alice.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(unsafe.Pointer(C.onReceiveHello)))
-    alice.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(unsafe.Pointer(C.onReceiveAck)))
-    alice.net.RegConnHandler(salticidae.MsgNetworkConnCallback(unsafe.Pointer(C.connHandler)))
+    alice.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(C.onReceiveHello))
+    alice.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(C.onReceiveAck))
+    alice.net.RegConnHandler(salticidae.MsgNetworkConnCallback(C.connHandler))
 
-    bob.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(unsafe.Pointer(C.onReceiveHello)))
-    bob.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(unsafe.Pointer(C.onReceiveAck)))
-    bob.net.RegConnHandler(salticidae.MsgNetworkConnCallback(unsafe.Pointer(C.connHandler)))
+    bob.net.RegHandler(MSG_OPCODE_HELLO, salticidae.MsgNetworkMsgCallback(C.onReceiveHello))
+    bob.net.RegHandler(MSG_OPCODE_ACK, salticidae.MsgNetworkMsgCallback(C.onReceiveAck))
+    bob.net.RegConnHandler(salticidae.MsgNetworkConnCallback(C.connHandler))
 
     alice.net.Start()
     bob.net.Start()
@@ -150,9 +149,9 @@ func main() {
     alice_addr.Free()
     bob_addr.Free()
 
-    ev_int := salticidae.NewSigEvent(ec, salticidae.SigEventCallback(unsafe.Pointer(C.onTerm)))
+    ev_int := salticidae.NewSigEvent(ec, salticidae.SigEventCallback(C.onTerm))
     ev_int.Add(salticidae.SIGINT)
-    ev_term := salticidae.NewSigEvent(ec, salticidae.SigEventCallback(unsafe.Pointer(C.onTerm)))
+    ev_term := salticidae.NewSigEvent(ec, salticidae.SigEventCallback(C.onTerm))
     ev_term.Add(salticidae.SIGTERM)
 
     ec.Dispatch()