Skip to content

Commit 4206a78

Browse files
shogo82148shogo82148
authored
Merge pull request #21 from shogo82148/drop-go17-support
Drop Go 1.7 support, no need to fallback SeekStart.
2 parents 89dd9a9 + 260aa96 commit 4206a78

File tree

5 files changed

+17
-31
lines changed

5 files changed

+17
-31
lines changed

‎common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func readStringPool(sr *io.SectionReader) (*ResStringPool, error) {
139139
for i, start := range stringStarts {
140140
var str string
141141
var err error
142-
if _, err := sr.Seek(int64(sp.Header.StringStart+start), seekStart); err != nil {
142+
if _, err := sr.Seek(int64(sp.Header.StringStart+start), io.SeekStart); err != nil {
143143
return nil, err
144144
}
145145
if (sp.Header.Flags & UTF8Flag) == 0 {
@@ -155,7 +155,7 @@ func readStringPool(sr *io.SectionReader) (*ResStringPool, error) {
155155

156156
sp.Styles = make([]ResStringPoolSpan, sp.Header.StyleCount)
157157
for i, start := range styleStarts {
158-
if _, err := sr.Seek(int64(sp.Header.StylesStart+start), seekStart); err != nil {
158+
if _, err := sr.Seek(int64(sp.Header.StylesStart+start), io.SeekStart); err != nil {
159159
return nil, err
160160
}
161161
if err := binary.Read(sr, binary.LittleEndian, &sp.Styles[i]); err != nil {

‎const_fallback.go

-7
This file was deleted.

‎const_go17.go

-7
This file was deleted.

‎table.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,15 @@ func (f *TableFile) GetString(ref ResStringPoolRef) string {
302302
func (f *TableFile) readChunk(r io.ReaderAt, offset int64) (*ResChunkHeader, error) {
303303
sr := io.NewSectionReader(r, offset, 1<<63-1-offset)
304304
chunkHeader := &ResChunkHeader{}
305-
if _, err := sr.Seek(0, seekStart); err != nil {
305+
if _, err := sr.Seek(0, io.SeekStart); err != nil {
306306
return nil, err
307307
}
308308
if err := binary.Read(sr, binary.LittleEndian, chunkHeader); err != nil {
309309
return nil, err
310310
}
311311

312312
var err error
313-
if _, err := sr.Seek(0, seekStart); err != nil {
313+
if _, err := sr.Seek(0, io.SeekStart); err != nil {
314314
return nil, err
315315
}
316316
switch chunkHeader.Type {
@@ -353,7 +353,7 @@ func readTablePackage(sr *io.SectionReader) (*TablePackage, error) {
353353
offset := int64(header.Header.HeaderSize)
354354
for offset < int64(header.Header.Size) {
355355
chunkHeader := &ResChunkHeader{}
356-
if _, err := sr.Seek(offset, seekStart); err != nil {
356+
if _, err := sr.Seek(offset, io.SeekStart); err != nil {
357357
return nil, err
358358
}
359359
if err := binary.Read(sr, binary.LittleEndian, chunkHeader); err != nil {
@@ -362,7 +362,7 @@ func readTablePackage(sr *io.SectionReader) (*TablePackage, error) {
362362

363363
var err error
364364
chunkReader := io.NewSectionReader(sr, offset, int64(chunkHeader.Size))
365-
if _, err := sr.Seek(offset, seekStart); err != nil {
365+
if _, err := sr.Seek(offset, io.SeekStart); err != nil {
366366
return nil, err
367367
}
368368
switch chunkHeader.Type {
@@ -385,7 +385,7 @@ func readTablePackage(sr *io.SectionReader) (*TablePackage, error) {
385385
func readTableType(chunkHeader *ResChunkHeader, sr *io.SectionReader) (*TableType, error) {
386386
// TableType header may be omitted
387387
header := new(ResTableType)
388-
if _, err := sr.Seek(0, seekStart); err != nil {
388+
if _, err := sr.Seek(0, io.SeekStart); err != nil {
389389
return nil, err
390390
}
391391
buf, err := newZeroFilledReader(sr, int64(chunkHeader.HeaderSize), int64(unsafe.Sizeof(*header)))
@@ -397,7 +397,7 @@ func readTableType(chunkHeader *ResChunkHeader, sr *io.SectionReader) (*TableTyp
397397
}
398398

399399
entryIndexes := make([]uint32, header.EntryCount)
400-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
400+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
401401
return nil, err
402402
}
403403
if err := binary.Read(sr, binary.LittleEndian, entryIndexes); err != nil {
@@ -409,7 +409,7 @@ func readTableType(chunkHeader *ResChunkHeader, sr *io.SectionReader) (*TableTyp
409409
if index == 0xFFFFFFFF {
410410
continue
411411
}
412-
if _, err := sr.Seek(int64(header.EntriesStart+index), seekStart); err != nil {
412+
if _, err := sr.Seek(int64(header.EntriesStart+index), io.SeekStart); err != nil {
413413
return nil, err
414414
}
415415
var key ResTableEntry
@@ -433,7 +433,7 @@ func readTableTypeSpec(sr *io.SectionReader) ([]uint32, error) {
433433
}
434434

435435
flags := make([]uint32, header.EntryCount)
436-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
436+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
437437
return nil, err
438438
}
439439
if err := binary.Read(sr, binary.LittleEndian, flags); err != nil {

‎xml.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ func (f *XMLFile) Reader() *bytes.Reader {
8686
func (f *XMLFile) readChunk(r io.ReaderAt, offset int64) (*ResChunkHeader, error) {
8787
sr := io.NewSectionReader(r, offset, 1<<63-1-offset)
8888
chunkHeader := &ResChunkHeader{}
89-
if _, err := sr.Seek(0, seekStart); err != nil {
89+
if _, err := sr.Seek(0, io.SeekStart); err != nil {
9090
return nil, err
9191
}
9292
if err := binary.Read(sr, binary.LittleEndian, chunkHeader); err != nil {
9393
return nil, err
9494
}
9595

9696
var err error
97-
if _, err := sr.Seek(0, seekStart); err != nil {
97+
if _, err := sr.Seek(0, io.SeekStart); err != nil {
9898
return nil, err
9999
}
100100
switch chunkHeader.Type {
@@ -127,7 +127,7 @@ func (f *XMLFile) readStartNamespace(sr *io.SectionReader) error {
127127
return err
128128
}
129129

130-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
130+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
131131
return err
132132
}
133133
namespace := new(ResXMLTreeNamespaceExt)
@@ -154,7 +154,7 @@ func (f *XMLFile) readEndNamespace(sr *io.SectionReader) error {
154154
return err
155155
}
156156

157-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
157+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
158158
return err
159159
}
160160
namespace := new(ResXMLTreeNamespaceExt)
@@ -179,7 +179,7 @@ func (f *XMLFile) readStartElement(sr *io.SectionReader) error {
179179
return err
180180
}
181181

182-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
182+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
183183
return err
184184
}
185185
ext := new(ResXMLTreeAttrExt)
@@ -202,7 +202,7 @@ func (f *XMLFile) readStartElement(sr *io.SectionReader) error {
202202
// process attributes
203203
offset := int64(ext.AttributeStart + header.Header.HeaderSize)
204204
for i := 0; i < int(ext.AttributeCount); i++ {
205-
if _, err := sr.Seek(offset, seekStart); err != nil {
205+
if _, err := sr.Seek(offset, io.SeekStart); err != nil {
206206
return err
207207
}
208208
attr := new(ResXMLTreeAttribute)
@@ -247,7 +247,7 @@ func (f *XMLFile) readEndElement(sr *io.SectionReader) error {
247247
if err := binary.Read(sr, binary.LittleEndian, header); err != nil {
248248
return err
249249
}
250-
if _, err := sr.Seek(int64(header.Header.HeaderSize), seekStart); err != nil {
250+
if _, err := sr.Seek(int64(header.Header.HeaderSize), io.SeekStart); err != nil {
251251
return err
252252
}
253253
ext := new(ResXMLTreeEndElementExt)

0 commit comments

Comments
 (0)