security/hakurei
security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 9 Wiki Activity

internal/pipewire: simplify spa_dict appends
All checks were successful
Test / Create distribution (push) Successful in 43s
Details
Test / Sandbox (push) Successful in 2m33s
Details
Test / Hakurei (push) Successful in 3m31s
Details
Test / Hpkg (push) Successful in 4m16s
Details
Test / Sandbox (race detector) (push) Successful in 4m29s
Details
Test / Hakurei (race detector) (push) Successful in 5m20s
Details
Test / Flake checks (push) Successful in 1m30s
Details

Browse Source 
This change uses the (somewhat) newly exposed MarshalAppend which improves readability.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-11-27 01:52:13 +09:00
parent 2edcfe1e68
commit 563b5e66fc
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/pipewire/pod.go
View File

@ -441,30 +441,26 @@ type SPADict struct {
Items []SPADictItem
}
// MarshalPOD satisfies [PODMarshaler] as [SPADict] violates the POD type system.
func (d *SPADict) MarshalPOD() ([]byte, error) {
return appendInner(nil, func(data []byte) ([]byte, error) {
data = binary.NativeEndian.AppendUint32(data, SPA_TYPE_Struct)
if extraData, err := Marshal(d.NItems); err != nil {
return data, err
} else {
data = append(data, extraData...)
return appendInner(nil, func(dataPrefix []byte) (data []byte, err error) {
data = binary.NativeEndian.AppendUint32(dataPrefix, SPA_TYPE_Struct)
if data, err = MarshalAppend(data, d.NItems); err != nil {
return
}
for i := range d.Items {
if extraData, err := Marshal(d.Items[i].Key); err != nil {
return data, err
} else {
data = append(data, extraData...)
if data, err = MarshalAppend(data, d.Items[i].Key); err != nil {
return
}
if extraData, err := Marshal(d.Items[i].Value); err != nil {
return data, err
} else {
data = append(data, extraData...)
if data, err = MarshalAppend(data, d.Items[i].Value); err != nil {
return
}
}
return data, nil
return
})
}
// UnmarshalPOD satisfies [PODUnmarshaler] as [SPADict] violates the POD type system.
func (d *SPADict) UnmarshalPOD(data []byte) (Word, error) {
var wireSize Word
if err := unmarshalCheckTypeBounds(&data, SPA_TYPE_Struct, &wireSize); err != nil {