Add the new callbacks for Remote.Push()

This unifies the types with the Push struct, in preparation for its
deletion.

1 files changed, 4 insertions, 7 deletions

diff --git a/push.go b/push.go
index ff96b08..f5299c4 100644
--- a/push.go
+++ b/push.go
@@ -146,17 +146,14 @@ type PushCallbacks struct {
 	TransferProgress    *PushTransferProgressCallback
 }
 
-type PackbuilderProgressCallback func(stage int, current uint, total uint) int
-type PushTransferProgressCallback func(current uint, total uint, bytes uint) int
-
 //export packbuilderProgress
 func packbuilderProgress(stage C.int, current C.uint, total C.uint, data unsafe.Pointer) C.int {
-	return C.int((*(*PackbuilderProgressCallback)(data))(int(stage), uint(current), uint(total)))
+	return C.int((*(*PackbuilderProgressCallback)(data))(int32(stage), uint32(current), uint32(total)))
 }
 
-//export pushTransferProgress
-func pushTransferProgress(current C.uint, total C.uint, bytes C.size_t, data unsafe.Pointer) C.int {
-	return C.int((*(*PushTransferProgressCallback)(data))(uint(current), uint(total), uint(bytes)))
+//export pushStructTransferProgress
+func pushStructTransferProgress(current C.uint, total C.uint, bytes C.size_t, data unsafe.Pointer) C.int {
+	return C.int((*(*PushTransferProgressCallback)(data))(uint32(current), uint32(total), uint(bytes)))
 }
 
 func (p *Push) SetCallbacks(callbacks PushCallbacks) {