mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtmp: simplify unsafe slice conversion 

Mechanical:

gofmt -w -r 'ptrToSlice(unsafe.Pointer(p),i)->(*[_Gi]byte)(unsafe.Pointer(p))[:i]' {rtmp,parseurl,amf}.go
This commit is contained in:
Dan Kortschak 2018-08-31 11:42:22 +09:30
parent 0053034e94
commit 52c6b1f60a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtmp/rtmp.go
View File

@ -281,9 +281,9 @@ func C_SocksSetup(r *C_RTMP, sockshost *C_AVal) {
r.Link.sockshost.av_val = (*byte)(unsafe.Pointer(hostname)) r.Link.sockshost.av_val = (*byte)(unsafe.Pointer(hostname))
r.Link.sockshost.av_len = int32(strlen(hostname)) r.Link.sockshost.av_len = int32(strlen(hostname))
value, err := strconv.Atoi(string(ptrToSlice(unsafe.Pointer(uintptr( value, err := strconv.Atoi(string((*[_Gi]byte)(unsafe.Pointer(uintptr(
unsafe.Pointer(socksport))+uintptr(1)), int(strlen((*byte)(unsafe.Pointer( unsafe.Pointer(socksport)) + uintptr(1)))[:int(strlen((*byte)(unsafe.Pointer(
uintptr(unsafe.Pointer(socksport))+uintptr(1)))))+1))) uintptr(unsafe.Pointer(socksport))+uintptr(1)))))+1]))
if err != nil { if err != nil {
log.Println("C_SocksSetup: bad string conversion!") log.Println("C_SocksSetup: bad string conversion!")
} }
@ -337,11 +337,9 @@ func C_RTMP_SetupURL(r *C_RTMP, u string) int32 {
int32(len("rtmpte://:65535/\x00")) int32(len("rtmpte://:65535/\x00"))
r.Link.tcUrl.av_val = (*byte)(malloc(uintptr(uintptr(length)))) r.Link.tcUrl.av_val = (*byte)(malloc(uintptr(uintptr(length))))
hostname := string(ptrToSlice(unsafe.Pointer(r.Link.hostname.av_val), hostname := string((*[_Gi]byte)(unsafe.Pointer(r.Link.hostname.av_val))[:int(r.Link.hostname.av_len)])
int(r.Link.hostname.av_len)))
app := string(ptrToSlice(unsafe.Pointer(r.Link.app.av_val), app := string((*[_Gi]byte)(unsafe.Pointer(r.Link.app.av_val))[:int(r.Link.app.av_len)])
int(r.Link.app.av_len)))
fString := fmt.Sprintf("%v://%v:%v/%v", fString := fmt.Sprintf("%v://%v:%v/%v",
RTMPProtocolStringsLower[r.Link.protocol], hostname, r.Link.port, app) RTMPProtocolStringsLower[r.Link.protocol], hostname, r.Link.port, app)
@ -2263,14 +2261,14 @@ func goStrToCStr(str string) *byte {
// TODO: need a test in rtmp_test.go // TODO: need a test in rtmp_test.go
func cStrToGoStr(cStr *byte) string { func cStrToGoStr(cStr *byte) string {
return string(ptrToSlice(unsafe.Pointer(cStr), int(strlen(cStr)))) return string((*[_Gi]byte)(unsafe.Pointer(cStr))[:int(strlen(cStr))])
} }
// Duplicates a string given as a byte pointer // Duplicates a string given as a byte pointer
func strdup(str *byte) *byte { func strdup(str *byte) *byte {
length := strlen(str) length := strlen(str)
newMem := make([]byte, length+1) newMem := make([]byte, length+1)
oldMem := ptrToSlice(unsafe.Pointer(str), int(length+1)) oldMem := (*[_Gi]byte)(unsafe.Pointer(str))[:int(length+1)]
copy(newMem, oldMem) copy(newMem, oldMem)
return &newMem[0] return &newMem[0]
} }