Skip to content

Commit 3e0dcd3

Browse files
oschwaldoschwald
committed
Run golines on code
1 parent ceadb88 commit 3e0dcd3

File tree

8 files changed

+141
-33
lines changed

8 files changed

+141
-33
lines changed

‎decoder.go

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ const (
4242

4343
func (d *decoder) decode(offset uint, result reflect.Value, depth int) (uint, error) {
4444
if depth > maximumDataStructureDepth {
45-
return 0, newInvalidDatabaseError("exceeded maximum data structure depth; database is likely corrupt")
45+
return 0, newInvalidDatabaseError(
46+
"exceeded maximum data structure depth; database is likely corrupt",
47+
)
4648
}
4749
typeNum, size, newOffset, err := d.decodeCtrlData(offset)
4850
if err != nil {
@@ -56,9 +58,16 @@ func (d *decoder) decode(offset uint, result reflect.Value, depth int) (uint, er
5658
return d.decodeFromType(typeNum, size, newOffset, result, depth+1)
5759
}
5860

59-
func (d *decoder) decodeToDeserializer(offset uint, dser deserializer, depth int, getNext bool) (uint, error) {
61+
func (d *decoder) decodeToDeserializer(
62+
offset uint,
63+
dser deserializer,
64+
depth int,
65+
getNext bool,
66+
) (uint, error) {
6067
if depth > maximumDataStructureDepth {
61-
return 0, newInvalidDatabaseError("exceeded maximum data structure depth; database is likely corrupt")
68+
return 0, newInvalidDatabaseError(
69+
"exceeded maximum data structure depth; database is likely corrupt",
70+
)
6271
}
6372
skip, err := dser.ShouldSkip(uintptr(offset))
6473
if err != nil {
@@ -100,7 +109,11 @@ func (d *decoder) decodeCtrlData(offset uint) (dataType, uint, uint, error) {
100109
return typeNum, size, newOffset, err
101110
}
102111

103-
func (d *decoder) sizeFromCtrlByte(ctrlByte byte, offset uint, typeNum dataType) (uint, uint, error) {
112+
func (d *decoder) sizeFromCtrlByte(
113+
ctrlByte byte,
114+
offset uint,
115+
typeNum dataType,
116+
) (uint, uint, error) {
104117
size := uint(ctrlByte & 0x1f)
105118
if typeNum == _Extended {
106119
return size, offset, nil
@@ -244,7 +257,10 @@ func (d *decoder) decodeFromTypeToDeserializer(
244257

245258
func (d *decoder) unmarshalBool(size, offset uint, result reflect.Value) (uint, error) {
246259
if size > 1 {
247-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (bool size of %v)", size)
260+
return 0, newInvalidDatabaseError(
261+
"the MaxMind DB file's data section contains bad data (bool size of %v)",
262+
size,
263+
)
248264
}
249265
value, newOffset := d.decodeBool(size, offset)
250266

@@ -312,7 +328,10 @@ func (d *decoder) unmarshalBytes(size, offset uint, result reflect.Value) (uint,
312328

313329
func (d *decoder) unmarshalFloat32(size, offset uint, result reflect.Value) (uint, error) {
314330
if size != 4 {
315-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (float32 size of %v)", size)
331+
return 0, newInvalidDatabaseError(
332+
"the MaxMind DB file's data section contains bad data (float32 size of %v)",
333+
size,
334+
)
316335
}
317336
value, newOffset := d.decodeFloat32(size, offset)
318337

@@ -331,7 +350,10 @@ func (d *decoder) unmarshalFloat32(size, offset uint, result reflect.Value) (uin
331350

332351
func (d *decoder) unmarshalFloat64(size, offset uint, result reflect.Value) (uint, error) {
333352
if size != 8 {
334-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (float 64 size of %v)", size)
353+
return 0, newInvalidDatabaseError(
354+
"the MaxMind DB file's data section contains bad data (float 64 size of %v)",
355+
size,
356+
)
335357
}
336358
value, newOffset := d.decodeFloat64(size, offset)
337359

@@ -353,7 +375,10 @@ func (d *decoder) unmarshalFloat64(size, offset uint, result reflect.Value) (uin
353375

354376
func (d *decoder) unmarshalInt32(size, offset uint, result reflect.Value) (uint, error) {
355377
if size > 4 {
356-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (int32 size of %v)", size)
378+
return 0, newInvalidDatabaseError(
379+
"the MaxMind DB file's data section contains bad data (int32 size of %v)",
380+
size,
381+
)
357382
}
358383
value, newOffset := d.decodeInt(size, offset)
359384

@@ -364,7 +389,12 @@ func (d *decoder) unmarshalInt32(size, offset uint, result reflect.Value) (uint,
364389
result.SetInt(n)
365390
return newOffset, nil
366391
}
367-
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
392+
case reflect.Uint,
393+
reflect.Uint8,
394+
reflect.Uint16,
395+
reflect.Uint32,
396+
reflect.Uint64,
397+
reflect.Uintptr:
368398
n := uint64(value)
369399
if !result.OverflowUint(n) {
370400
result.SetUint(n)
@@ -404,7 +434,11 @@ func (d *decoder) unmarshalMap(
404434
}
405435
}
406436

407-
func (d *decoder) unmarshalPointer(size, offset uint, result reflect.Value, depth int) (uint, error) {
437+
func (d *decoder) unmarshalPointer(
438+
size, offset uint,
439+
result reflect.Value,
440+
depth int,
441+
) (uint, error) {
408442
pointer, newOffset, err := d.decodePointer(size, offset)
409443
if err != nil {
410444
return 0, err
@@ -450,9 +484,17 @@ func (d *decoder) unmarshalString(size, offset uint, result reflect.Value) (uint
450484
return newOffset, newUnmarshalTypeError(value, result.Type())
451485
}
452486

453-
func (d *decoder) unmarshalUint(size, offset uint, result reflect.Value, uintType uint) (uint, error) {
487+
func (d *decoder) unmarshalUint(
488+
size, offset uint,
489+
result reflect.Value,
490+
uintType uint,
491+
) (uint, error) {
454492
if size > uintType/8 {
455-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (uint%v size of %v)", uintType, size)
493+
return 0, newInvalidDatabaseError(
494+
"the MaxMind DB file's data section contains bad data (uint%v size of %v)",
495+
uintType,
496+
size,
497+
)
456498
}
457499

458500
value, newOffset := d.decodeUint(size, offset)
@@ -464,7 +506,12 @@ func (d *decoder) unmarshalUint(size, offset uint, result reflect.Value, uintTyp
464506
result.SetInt(n)
465507
return newOffset, nil
466508
}
467-
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
509+
case reflect.Uint,
510+
reflect.Uint8,
511+
reflect.Uint16,
512+
reflect.Uint32,
513+
reflect.Uint64,
514+
reflect.Uintptr:
468515
if !result.OverflowUint(value) {
469516
result.SetUint(value)
470517
return newOffset, nil
@@ -482,7 +529,10 @@ var bigIntType = reflect.TypeOf(big.Int{})
482529

483530
func (d *decoder) unmarshalUint128(size, offset uint, result reflect.Value) (uint, error) {
484531
if size > 16 {
485-
return 0, newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (uint128 size of %v)", size)
532+
return 0, newInvalidDatabaseError(
533+
"the MaxMind DB file's data section contains bad data (uint128 size of %v)",
534+
size,
535+
)
486536
}
487537
value, newOffset := d.decodeUint128(size, offset)
488538

‎decoder_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,12 @@ func TestMap(t *testing.T) {
7373
"e0": map[string]interface{}{},
7474
"e142656e43466f6f": map[string]interface{}{"en": "Foo"},
7575
"e242656e43466f6f427a6843e4baba": map[string]interface{}{"en": "Foo", "zh": "人"},
76-
"e1446e616d65e242656e43466f6f427a6843e4baba": map[string]interface{}{"name": map[string]interface{}{"en": "Foo", "zh": "人"}},
77-
"e1496c616e677561676573020442656e427a68": map[string]interface{}{"languages": []interface{}{"en", "zh"}},
76+
"e1446e616d65e242656e43466f6f427a6843e4baba": map[string]interface{}{
77+
"name": map[string]interface{}{"en": "Foo", "zh": "人"},
78+
},
79+
"e1496c616e677561676573020442656e427a68": map[string]interface{}{
80+
"languages": []interface{}{"en", "zh"},
81+
},
7882
}
7983
validateDecoding(t, maps)
8084
}

‎node.go

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,49 @@ type nodeReader24 struct {
1010
}
1111

1212
func (n nodeReader24) readLeft(nodeNumber uint) uint {
13-
return (uint(n.buffer[nodeNumber]) << 16) | (uint(n.buffer[nodeNumber+1]) << 8) | uint(n.buffer[nodeNumber+2])
13+
return (uint(n.buffer[nodeNumber]) << 16) |
14+
(uint(n.buffer[nodeNumber+1]) << 8) |
15+
uint(n.buffer[nodeNumber+2])
1416
}
1517

1618
func (n nodeReader24) readRight(nodeNumber uint) uint {
17-
return (uint(n.buffer[nodeNumber+3]) << 16) | (uint(n.buffer[nodeNumber+4]) << 8) | uint(n.buffer[nodeNumber+5])
19+
return (uint(n.buffer[nodeNumber+3]) << 16) |
20+
(uint(n.buffer[nodeNumber+4]) << 8) |
21+
uint(n.buffer[nodeNumber+5])
1822
}
1923

2024
type nodeReader28 struct {
2125
buffer []byte
2226
}
2327

2428
func (n nodeReader28) readLeft(nodeNumber uint) uint {
25-
return ((uint(n.buffer[nodeNumber+3]) & 0xF0) << 20) | (uint(n.buffer[nodeNumber]) << 16) | (uint(n.buffer[nodeNumber+1]) << 8) | uint(n.buffer[nodeNumber+2])
29+
return ((uint(n.buffer[nodeNumber+3]) & 0xF0) << 20) |
30+
(uint(n.buffer[nodeNumber]) << 16) |
31+
(uint(n.buffer[nodeNumber+1]) << 8) |
32+
uint(n.buffer[nodeNumber+2])
2633
}
2734

2835
func (n nodeReader28) readRight(nodeNumber uint) uint {
29-
return ((uint(n.buffer[nodeNumber+3]) & 0x0F) << 24) | (uint(n.buffer[nodeNumber+4]) << 16) | (uint(n.buffer[nodeNumber+5]) << 8) | uint(n.buffer[nodeNumber+6])
36+
return ((uint(n.buffer[nodeNumber+3]) & 0x0F) << 24) |
37+
(uint(n.buffer[nodeNumber+4]) << 16) |
38+
(uint(n.buffer[nodeNumber+5]) << 8) |
39+
uint(n.buffer[nodeNumber+6])
3040
}
3141

3242
type nodeReader32 struct {
3343
buffer []byte
3444
}
3545

3646
func (n nodeReader32) readLeft(nodeNumber uint) uint {
37-
return (uint(n.buffer[nodeNumber]) << 24) | (uint(n.buffer[nodeNumber+1]) << 16) | (uint(n.buffer[nodeNumber+2]) << 8) | uint(n.buffer[nodeNumber+3])
47+
return (uint(n.buffer[nodeNumber]) << 24) |
48+
(uint(n.buffer[nodeNumber+1]) << 16) |
49+
(uint(n.buffer[nodeNumber+2]) << 8) |
50+
uint(n.buffer[nodeNumber+3])
3851
}
3952

4053
func (n nodeReader32) readRight(nodeNumber uint) uint {
41-
return (uint(n.buffer[nodeNumber+4]) << 24) | (uint(n.buffer[nodeNumber+5]) << 16) | (uint(n.buffer[nodeNumber+6]) << 8) | uint(n.buffer[nodeNumber+7])
54+
return (uint(n.buffer[nodeNumber+4]) << 24) |
55+
(uint(n.buffer[nodeNumber+5]) << 16) |
56+
(uint(n.buffer[nodeNumber+6]) << 8) |
57+
uint(n.buffer[nodeNumber+7])
4258
}

‎reader.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,10 @@ func (r *Reader) Lookup(ip net.IP, result interface{}) error {
150150
// database record cannot be stored in result because of type differences, an
151151
// UnmarshalTypeError is returned. If the database is invalid or otherwise
152152
// cannot be read, an InvalidDatabaseError is returned.
153-
func (r *Reader) LookupNetwork(ip net.IP, result interface{}) (network *net.IPNet, ok bool, err error) {
153+
func (r *Reader) LookupNetwork(
154+
ip net.IP,
155+
result interface{},
156+
) (network *net.IPNet, ok bool, err error) {
154157
if r.buffer == nil {
155158
return nil, false, errors.New("cannot call Lookup on a closed database")
156159
}
@@ -246,7 +249,10 @@ func (r *Reader) lookupPointer(ip net.IP) (uint, int, net.IP, error) {
246249
ip = ipV4Address
247250
}
248251
if len(ip) == 16 && r.Metadata.IPVersion == 4 {
249-
return 0, 0, ip, fmt.Errorf("error looking up '%s': you attempted to look up an IPv6 address in an IPv4-only database", ip.String())
252+
return 0, 0, ip, fmt.Errorf(
253+
"error looking up '%s': you attempted to look up an IPv6 address in an IPv4-only database",
254+
ip.String(),
255+
)
250256
}
251257

252258
bitCount := uint(len(ip) * 8)

‎reader_test.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ import (
1818
func TestReader(t *testing.T) {
1919
for _, recordSize := range []uint{24, 28, 32} {
2020
for _, ipVersion := range []uint{4, 6} {
21-
fileName := fmt.Sprintf(testFile("MaxMind-DB-test-ipv%d-%d.mmdb"), ipVersion, recordSize)
21+
fileName := fmt.Sprintf(
22+
testFile("MaxMind-DB-test-ipv%d-%d.mmdb"),
23+
ipVersion,
24+
recordSize,
25+
)
2226
reader, err := Open(fileName)
2327
require.NoError(t, err, "unexpected error while opening database: %v", err)
2428
checkMetadata(t, reader, ipVersion, recordSize)
@@ -35,7 +39,11 @@ func TestReader(t *testing.T) {
3539
func TestReaderBytes(t *testing.T) {
3640
for _, recordSize := range []uint{24, 28, 32} {
3741
for _, ipVersion := range []uint{4, 6} {
38-
fileName := fmt.Sprintf(testFile("MaxMind-DB-test-ipv%d-%d.mmdb"), ipVersion, recordSize)
42+
fileName := fmt.Sprintf(
43+
testFile("MaxMind-DB-test-ipv%d-%d.mmdb"),
44+
ipVersion,
45+
recordSize,
46+
)
3947
bytes, _ := ioutil.ReadFile(fileName)
4048
reader, err := FromBytes(bytes)
4149
require.NoError(t, err, "unexpected error while opening bytes: %v", err)
@@ -331,7 +339,11 @@ func TestNonEmptyNilInterface(t *testing.T) {
331339
require.NoError(t, err)
332340

333341
err = reader.Lookup(net.ParseIP("::1.1.1.0"), &result)
334-
assert.Equal(t, "maxminddb: cannot unmarshal map into type maxminddb.TestInterface", err.Error())
342+
assert.Equal(
343+
t,
344+
"maxminddb: cannot unmarshal map into type maxminddb.TestInterface",
345+
err.Error(),
346+
)
335347
}
336348

337349
type CityTraits struct {
@@ -504,7 +516,9 @@ func TestIpv6inIpv4(t *testing.T) {
504516
var emptyResult TestType
505517
assert.Equal(t, emptyResult, result)
506518

507-
expected := errors.New("error looking up '2001::': you attempted to look up an IPv6 address in an IPv4-only database")
519+
expected := errors.New(
520+
"error looking up '2001::': you attempted to look up an IPv6 address in an IPv4-only database",
521+
)
508522
assert.Equal(t, expected, err)
509523
assert.NoError(t, reader.Close(), "error on close")
510524
}
@@ -516,7 +530,9 @@ func TestBrokenDoubleDatabase(t *testing.T) {
516530
var result interface{}
517531
err = reader.Lookup(net.ParseIP("2001:220::"), &result)
518532

519-
expected := newInvalidDatabaseError("the MaxMind DB file's data section contains bad data (float 64 size of 2)")
533+
expected := newInvalidDatabaseError(
534+
"the MaxMind DB file's data section contains bad data (float 64 size of 2)",
535+
)
520536
assert.Equal(t, expected, err)
521537
assert.NoError(t, reader.Close(), "error on close")
522538
}

‎traverse_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import (
1212
func TestNetworks(t *testing.T) {
1313
for _, recordSize := range []uint{24, 28, 32} {
1414
for _, ipVersion := range []uint{4, 6} {
15-
fileName := testFile(fmt.Sprintf("MaxMind-DB-test-ipv%d-%d.mmdb", ipVersion, recordSize))
15+
fileName := testFile(
16+
fmt.Sprintf("MaxMind-DB-test-ipv%d-%d.mmdb", ipVersion, recordSize),
17+
)
1618
reader, err := Open(fileName)
1719
require.Nil(t, err, "unexpected error while opening database: %v", err)
1820

‎verifier.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,18 @@ func (v *verifier) verifyDataSection(offsets map[uint]bool) error {
141141
rv := reflect.ValueOf(&data)
142142
newOffset, err := decoder.decode(offset, rv, 0)
143143
if err != nil {
144-
return newInvalidDatabaseError("received decoding error (%v) at offset of %v", err, offset)
144+
return newInvalidDatabaseError(
145+
"received decoding error (%v) at offset of %v",
146+
err,
147+
offset,
148+
)
145149
}
146150
if newOffset <= offset {
147-
return newInvalidDatabaseError("data section offset unexpectedly went from %v to %v", offset, newOffset)
151+
return newInvalidDatabaseError(
152+
"data section offset unexpectedly went from %v to %v",
153+
offset,
154+
newOffset,
155+
)
148156
}
149157

150158
pointer := offset

‎verifier_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ func TestVerifyOnGoodDatabases(t *testing.T) {
3636
reader, err := Open(testFile(database))
3737
require.NoError(t, err)
3838

39-
assert.NoError(t, reader.Verify(), "Received error (%v) when verifying %v", err, database)
39+
assert.NoError(
40+
t,
41+
reader.Verify(),
42+
"Received error (%v) when verifying %v",
43+
err,
44+
database,
45+
)
4046
})
4147
}
4248
}

0 commit comments

Comments
 (0)