GIR: Don't use `unsafe.Pointer` where we don't have to

Signed-off-by: Felicitas Pojtinger <felicitas@pojtinger.com>

1 file · +4 -6

M internal/gir/types/template.go +4 -6


@@ -47,7 +47,7 @@ func (f *funcArgsTemplate) AddAPI(t string, n string, k Kind, ns string, nullabl
47	47		// For primitive Go types we need to manually add the *
48	48		t = "*" + t
49	49		}
50		-	c = fmt.Sprintf("uintptr(unsafe.Pointer(%s))", n)
	50	+	c = n
51	51		} else {
52	52		switch k {
53	53		case CallbackType:

@@ -96,14 +96,12 @@ func (f *funcArgsTemplate) AddPure(t string, n string, k Kind, isOut bool) {
96	96		stars := strings.Count(t, "*")
97	97
98	98		if isOut {
99		-	// Out parameters are always pointers in C, so we can use uintptr for the type
100		-	goPointerType := t
	99	+	// Out parameters are always pointers in C
101	100		if stars == 0 {
102	101		// For primitive Go types we need to manually add the *
103		-	goPointerType = "*" + t
	102	+	t = "*" + t
104	103		}
105		-	t = "uintptr"
106		-	c = fmt.Sprintf("(%s)(unsafe.Pointer(%s))", goPointerType, n)
	104	+	c = n
107	105		} else {
108	106		switch k {
109	107		case RecordsType:

 			// For primitive Go types we need to manually add the *
 			t = "*" + t
 		}
-		c = fmt.Sprintf("uintptr(unsafe.Pointer(%s))", n)
+		c = n
 	} else {
 		switch k {
 		case CallbackType:
 	stars := strings.Count(t, "*")
 	if isOut {
-		// Out parameters are always pointers in C, so we can use uintptr for the type
+		// Out parameters are always pointers in C
-		goPointerType := t
 		if stars == 0 {
 			// For primitive Go types we need to manually add the *
-			goPointerType = "*" + t
+			t = "*" + t
 		}
-		t = "uintptr"
+		c = n
-		c = fmt.Sprintf("(%s)(unsafe.Pointer(%s))", goPointerType, n)
 	} else {
 		switch k {
 		case RecordsType: