lechu/go-serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CFRef are no more internally represented as pointer but as integers

Browse Source 
This is due to improvements in CGO compiler for darwin OS
This commit is contained in:
Cristian Maglie
2018-08-19 18:13:24 +02:00
parent ef634e5745
commit 75aa16d69f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
enumerator/usb_go1.10_darwin.go
View File

@@ -144,12 +144,12 @@ func (me *C.io_registry_entry_t) GetStringProperty(key string) (string, error) {
k := cfStringCreateWithString(key) k := cfStringCreateWithString(key)
defer C.CFRelease(C.CFTypeRef(k)) defer C.CFRelease(C.CFTypeRef(k))
property := C.IORegistryEntryCreateCFProperty(*me, k, C.kCFAllocatorDefault, 0) property := C.IORegistryEntryCreateCFProperty(*me, k, C.kCFAllocatorDefault, 0)
if property == nil { if property == 0 {
return "", errors.New("Property not found: " + key) return "", errors.New("Property not found: " + key)
} }
defer C.CFRelease(property) defer C.CFRelease(property)
if ptr := C.CFStringGetCStringPtr((C.CFStringRef)(unsafe.Pointer(property)), 0); ptr != nil { if ptr := C.CFStringGetCStringPtr(C.CFStringRef(property), 0); ptr != nil {
return C.GoString(ptr), nil return C.GoString(ptr), nil
} }
// in certain circumstances CFStringGetCStringPtr may return NULL // in certain circumstances CFStringGetCStringPtr may return NULL
@@ -165,7 +165,7 @@ func (me *C.io_registry_entry_t) GetIntProperty(key string, intType C.CFNumberTy
k := cfStringCreateWithString(key) k := cfStringCreateWithString(key)
defer C.CFRelease(C.CFTypeRef(k)) defer C.CFRelease(C.CFTypeRef(k))
property := C.IORegistryEntryCreateCFProperty(*me, k, C.kCFAllocatorDefault, 0) property := C.IORegistryEntryCreateCFProperty(*me, k, C.kCFAllocatorDefault, 0)
if property == nil { if property == 0 {
return 0, errors.New("Property not found: " + key) return 0, errors.New("Property not found: " + key)
} }
defer C.CFRelease(property) defer C.CFRelease(property)