[fdio] Do not close VMOFile again on error
In f097da4cae2bead51359d4eddefb0b8b4fb850bd, the node handle was closed
when a failure was encountered in creating the VMOFile. Subsequently,
ef4119d3fa5da5f70797f2e1f0d2683bad99f154 noticed that Pipes and VMOFiles
should always be closed, and unconditionally closed the handle. This
change removes the second close, which would likely fail (the handle
already being closed), masking the error from creating the VMOFile.
This change also fixes some style around the fixed code. The call to
NewVMOFile should be on a single line, and the comma after the last
argument is unnecessary and confusing.
Change-Id: I014c6ca6ab7eb51328182d0cbb7457e2711c1745
diff --git a/src/syscall/zx/fdio/node.go b/src/syscall/zx/fdio/node.go
index 6828486..261d378 100644
--- a/src/syscall/zx/fdio/node.go
+++ b/src/syscall/zx/fdio/node.go
@@ -44,15 +44,8 @@
if err = ((*fidl.Proxy)(node)).Channel.Close(); err != nil {
return nil, err
}
- result, err = NewVMOFile(
- info.Vmofile.Vmo,
- info.Vmofile.Offset,
- info.Vmofile.Length,
- )
+ result, err = NewVMOFile(info.Vmofile.Vmo, info.Vmofile.Offset, info.Vmofile.Length)
if err != nil {
- if err = ((*fidl.Proxy)(node)).Channel.Close(); err != nil {
- return nil, err
- }
return nil, err
}
default:
