Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: mojo/public/go/bindings/decoder.go

Issue 948343008: go/bindings: update code to pass structs versions tests (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/go/tests/validation_test.go ('k') | mojo/public/go/bindings/message.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/go/bindings/decoder.go
diff --git a/mojo/public/go/bindings/decoder.go b/mojo/public/go/bindings/decoder.go
index 6f6b4330add2107b980af93755955a376002707c..34a230ef9acd8de1c430f195bc256d8889c6cf02 100644
--- a/mojo/public/go/bindings/decoder.go
+++ b/mojo/public/go/bindings/decoder.go
@@ -125,22 +125,22 @@ func (d *Decoder) StartMap() error {
return nil
}
-// StartStruct starts decoding a struct and reads its data header,
-// returning struct version declared in data header.
+// StartStruct starts decoding a struct and reads its data header.
+// Returns the read data header. The caller should check if it is valid.
// Note: it doesn't read a pointer to the encoded struct.
// Call |Finish()| after reading all fields.
-func (d *Decoder) StartStruct() (uint32, error) {
+func (d *Decoder) StartStruct() (DataHeader, error) {
header, err := d.readDataHeader()
if err != nil {
- return 0, err
+ return DataHeader{}, err
}
if header.Size < dataHeaderSize {
- return 0, fmt.Errorf("data header size is too small: is %d, but should be at least %d", header.Size, dataHeaderSize)
+ return DataHeader{}, fmt.Errorf("data header size(%d) should be at least %d", header.Size, dataHeaderSize)
}
if err := d.pushState(header, 0); err != nil {
- return 0, err
+ return DataHeader{}, err
}
- return header.ElementsOrVersion, nil
+ return header, nil
}
func (d *Decoder) readDataHeader() (DataHeader, error) {
« no previous file with comments | « mojo/go/tests/validation_test.go ('k') | mojo/public/go/bindings/message.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698