perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/db,cmd/stindex: Expose VersionList and use it in stindex

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3231
This commit is contained in:
Audrius Butkevicius
2016-05-31 19:29:26 +00:00
committed by Jakob Borg
parent 1612baca92
commit 6f63909c65
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/db/leveldb_xdr.go
View File

@@ -71,7 +71,7 @@ func (o *fileVersion) UnmarshalXDRFrom(u *xdr.Unmarshaller) error {
/*
versionList Structure:
VersionList Structure:
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -84,23 +84,23 @@ versionList Structure:
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
struct versionList {
struct VersionList {
fileVersion versions<>;
}
*/
func (o versionList) XDRSize() int {
func (o VersionList) XDRSize() int {
return 4 + xdr.SizeOfSlice(o.versions)
}
func (o versionList) MarshalXDR() ([]byte, error) {
func (o VersionList) MarshalXDR() ([]byte, error) {
buf := make([]byte, o.XDRSize())
m := &xdr.Marshaller{Data: buf}
return buf, o.MarshalXDRInto(m)
}
func (o versionList) MustMarshalXDR() []byte {
func (o VersionList) MustMarshalXDR() []byte {
bs, err := o.MarshalXDR()
if err != nil {
panic(err)
@@ -108,7 +108,7 @@ func (o versionList) MustMarshalXDR() []byte {
return bs
}
func (o versionList) MarshalXDRInto(m *xdr.Marshaller) error {
func (o VersionList) MarshalXDRInto(m *xdr.Marshaller) error {
m.MarshalUint32(uint32(len(o.versions)))
for i := range o.versions {
if err := o.versions[i].MarshalXDRInto(m); err != nil {
@@ -118,11 +118,11 @@ func (o versionList) MarshalXDRInto(m *xdr.Marshaller) error {
return m.Error
}
func (o *versionList) UnmarshalXDR(bs []byte) error {
func (o *VersionList) UnmarshalXDR(bs []byte) error {
u := &xdr.Unmarshaller{Data: bs}
return o.UnmarshalXDRFrom(u)
}
func (o *versionList) UnmarshalXDRFrom(u *xdr.Unmarshaller) error {
func (o *VersionList) UnmarshalXDRFrom(u *xdr.Unmarshaller) error {
_versionsSize := int(u.UnmarshalUint32())
if _versionsSize < 0 {
return xdr.ElementSizeExceeded("versions", _versionsSize, 0)