Skip to content

GitLab

Commit 534a974d authored by ale's avatar ale
Browse files
Options

Merge branch 'renovate/github.com-oschwald-maxminddb-golang-1.x' into 'master' 

Update module oschwald/maxminddb-golang to v1

See merge request !16
parents 4aea0caf 21470ce2
Pipeline #10703 passed with stages
        in 52 seconds
        Expand all Hide whitespace changes
        Inline Side-by-side
        Showing with 1475 additions and 605 deletions
        go.sum
        View file @ 534a974d
        ......@@ -278,6 +278,8 @@ github.com/oschwald/maxminddb-golang v0.0.0-20170901134056-26fe5ace1c70 h1:XGLYU
        github.com/oschwald/maxminddb-golang v0.0.0-20170901134056-26fe5ace1c70/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
        github.com/oschwald/maxminddb-golang v0.2.0 h1:cdvE3VUWCRdu+tYIBtwbcPWj1A83jZc5CSdGSuhnqO8=
        github.com/oschwald/maxminddb-golang v0.2.0/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
        github.com/oschwald/maxminddb-golang v1.8.0 h1:Uh/DSnGoxsyp/KYbY1AuP0tYEwfs0sCph9p/UMXK/Hk=
        github.com/oschwald/maxminddb-golang v1.8.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis=
        github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
        github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
        github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
        ......@@ -444,6 +446,7 @@ golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7w
        golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        ......
        vendor/github.com/oschwald/maxminddb-golang/.gitmodules
        View file @ 534a974d
        [submodule "test-data"]
        path = test-data
        url = git://github.com/maxmind/MaxMind-DB.git
        url = https://github.com/maxmind/MaxMind-DB.git
        vendor/github.com/oschwald/maxminddb-golang/.golangci.toml 0 → 100644
        View file @ 534a974d
        [run]
        deadline = "10m"
        tests = true
        [linters]
        disable-all = true
        enable = [
        "bodyclose",
        "deadcode",
        "depguard",
        "errcheck",
        "exportloopref",
        "goconst",
        "gocyclo",
        "gocritic",
        "gofumpt",
        "golint",
        "gosec",
        "gosimple",
        "govet",
        "ineffassign",
        "maligned",
        "misspell",
        "nakedret",
        "noctx",
        "nolintlint",
        "sqlclosecheck",
        "staticcheck",
        "structcheck",
        "stylecheck",
        "typecheck",
        "unconvert",
        "unparam",
        "unused",
        "varcheck",
        "vetshadow",
        ]
        [linters-settings.errcheck]
        ignore = "Close,fmt:.*"
        [linters-settings.gofumpt]
        extra-rules = true
        [issues]
        exclude-use-default = false
        [[issues.exclude-rules]]
        linters = [
        "gosec"
        ]
        # G304 - Potential file inclusion via variable (gosec)
        # G404 - "Use of weak random number generator (math/rand instead of crypto/rand)"
        # We only use this in tests.
        text = "G304|G404"
        vendor/github.com/oschwald/maxminddb-golang/.travis.yml deleted 100644 → 0
        View file @ 4aea0caf
        language: go
        go:
        - 1.1
        - 1.2
        - 1.3
        - release
        - tip
        install:
        - go get launchpad.net/gocheck
        vendor/github.com/oschwald/maxminddb-golang/LICENSE
        View file @ 534a974d
        ISC License
        Apache License
        Version 2.0, January 2004
        http://www.apache.org/licenses/
        Copyright (c) 2015, Gregory J. Oschwald <oschwald@gmail.com>
        TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
        Permission to use, copy, modify, and/or distribute this software for any
        purpose with or without fee is hereby granted, provided that the above
        copyright notice and this permission notice appear in all copies.
        1. Definitions.
        "License" shall mean the terms and conditions for use, reproduction,
        and distribution as defined by Sections 1 through 9 of this document.
        "Licensor" shall mean the copyright owner or entity authorized by
        the copyright owner that is granting the License.
        "Legal Entity" shall mean the union of the acting entity and all
        other entities that control, are controlled by, or are under common
        control with that entity. For the purposes of this definition,
        "control" means (i) the power, direct or indirect, to cause the
        direction or management of such entity, whether by contract or
        otherwise, or (ii) ownership of fifty percent (50%) or more of the
        outstanding shares, or (iii) beneficial ownership of such entity.
        "You" (or "Your") shall mean an individual or Legal Entity
        exercising permissions granted by this License.
        "Source" form shall mean the preferred form for making modifications,
        including but not limited to software source code, documentation
        source, and configuration files.
        "Object" form shall mean any form resulting from mechanical
        transformation or translation of a Source form, including but
        not limited to compiled object code, generated documentation,
        and conversions to other media types.
        "Work" shall mean the work of authorship, whether in Source or
        Object form, made available under the License, as indicated by a
        copyright notice that is included in or attached to the work
        (an example is provided in the Appendix below).
        "Derivative Works" shall mean any work, whether in Source or Object
        form, that is based on (or derived from) the Work and for which the
        editorial revisions, annotations, elaborations, or other modifications
        represent, as a whole, an original work of authorship. For the purposes
        of this License, Derivative Works shall not include works that remain
        separable from, or merely link (or bind by name) to the interfaces of,
        the Work and Derivative Works thereof.
        "Contribution" shall mean any work of authorship, including
        the original version of the Work and any modifications or additions
        to that Work or Derivative Works thereof, that is intentionally
        submitted to Licensor for inclusion in the Work by the copyright owner
        or by an individual or Legal Entity authorized to submit on behalf of
        the copyright owner. For the purposes of this definition, "submitted"
        means any form of electronic, verbal, or written communication sent
        to the Licensor or its representatives, including but not limited to
        communication on electronic mailing lists, source code control systems,
        and issue tracking systems that are managed by, or on behalf of, the
        Licensor for the purpose of discussing and improving the Work, but
        excluding communication that is conspicuously marked or otherwise
        designated in writing by the copyright owner as "Not a Contribution."
        "Contributor" shall mean Licensor and any individual or Legal Entity
        on behalf of whom a Contribution has been received by Licensor and
        subsequently incorporated within the Work.
        2. Grant of Copyright License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        copyright license to reproduce, prepare Derivative Works of,
        publicly display, publicly perform, sublicense, and distribute the
        Work and such Derivative Works in Source or Object form.
        3. Grant of Patent License. Subject to the terms and conditions of
        this License, each Contributor hereby grants to You a perpetual,
        worldwide, non-exclusive, no-charge, royalty-free, irrevocable
        (except as stated in this section) patent license to make, have made,
        use, offer to sell, sell, import, and otherwise transfer the Work,
        where such license applies only to those patent claims licensable
        by such Contributor that are necessarily infringed by their
        Contribution(s) alone or by combination of their Contribution(s)
        with the Work to which such Contribution(s) was submitted. If You
        institute patent litigation against any entity (including a
        cross-claim or counterclaim in a lawsuit) alleging that the Work
        or a Contribution incorporated within the Work constitutes direct
        or contributory patent infringement, then any patent licenses
        granted to You under this License for that Work shall terminate
        as of the date such litigation is filed.
        4. Redistribution. You may reproduce and distribute copies of the
        Work or Derivative Works thereof in any medium, with or without
        modifications, and in Source or Object form, provided that You
        meet the following conditions:
        (a) You must give any other recipients of the Work or
        Derivative Works a copy of this License; and
        (b) You must cause any modified files to carry prominent notices
        stating that You changed the files; and
        (c) You must retain, in the Source form of any Derivative Works
        that You distribute, all copyright, patent, trademark, and
        attribution notices from the Source form of the Work,
        excluding those notices that do not pertain to any part of
        the Derivative Works; and
        (d) If the Work includes a "NOTICE" text file as part of its
        distribution, then any Derivative Works that You distribute must
        include a readable copy of the attribution notices contained
        within such NOTICE file, excluding those notices that do not
        pertain to any part of the Derivative Works, in at least one
        of the following places: within a NOTICE text file distributed
        as part of the Derivative Works; within the Source form or
        documentation, if provided along with the Derivative Works; or,
        within a display generated by the Derivative Works, if and
        wherever such third-party notices normally appear. The contents
        of the NOTICE file are for informational purposes only and
        do not modify the License. You may add Your own attribution
        notices within Derivative Works that You distribute, alongside
        or as an addendum to the NOTICE text from the Work, provided
        that such additional attribution notices cannot be construed
        as modifying the License.
        You may add Your own copyright statement to Your modifications and
        may provide additional or different license terms and conditions
        for use, reproduction, or distribution of Your modifications, or
        for any such Derivative Works as a whole, provided Your use,
        reproduction, and distribution of the Work otherwise complies with
        the conditions stated in this License.
        5. Submission of Contributions. Unless You explicitly state otherwise,
        any Contribution intentionally submitted for inclusion in the Work
        by You to the Licensor shall be under the terms and conditions of
        this License, without any additional terms or conditions.
        Notwithstanding the above, nothing herein shall supersede or modify
        the terms of any separate license agreement you may have executed
        with Licensor regarding such Contributions.
        6. Trademarks. This License does not grant permission to use the trade
        names, trademarks, service marks, or product names of the Licensor,
        except as required for reasonable and customary use in describing the
        origin of the Work and reproducing the content of the NOTICE file.
        7. Disclaimer of Warranty. Unless required by applicable law or
        agreed to in writing, Licensor provides the Work (and each
        Contributor provides its Contributions) on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
        implied, including, without limitation, any warranties or conditions
        of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
        PARTICULAR PURPOSE. You are solely responsible for determining the
        appropriateness of using or redistributing the Work and assume any
        risks associated with Your exercise of permissions under this License.
        8. Limitation of Liability. In no event and under no legal theory,
        whether in tort (including negligence), contract, or otherwise,
        unless required by applicable law (such as deliberate and grossly
        negligent acts) or agreed to in writing, shall any Contributor be
        liable to You for damages, including any direct, indirect, special,
        incidental, or consequential damages of any character arising as a
        result of this License or out of the use or inability to use the
        Work (including but not limited to damages for loss of goodwill,
        work stoppage, computer failure or malfunction, or any and all
        other commercial damages or losses), even if such Contributor
        has been advised of the possibility of such damages.
        9. Accepting Warranty or Additional Liability. While redistributing
        the Work or Derivative Works thereof, You may choose to offer,
        and charge a fee for, acceptance of support, warranty, indemnity,
        or other liability obligations and/or rights consistent with this
        License. However, in accepting such obligations, You may act only
        on Your own behalf and on Your sole responsibility, not on behalf
        of any other Contributor, and only if You agree to indemnify,
        defend, and hold each Contributor harmless for any liability
        incurred by, or claims asserted against, such Contributor by reason
        of your accepting any such warranty or additional liability.
        END OF TERMS AND CONDITIONS
        APPENDIX: How to apply the Apache License to your work.
        To apply the Apache License to your work, attach the following
        boilerplate notice, with the fields enclosed by brackets "[]"
        replaced with your own identifying information. (Don't include
        the brackets!) The text should be enclosed in the appropriate
        comment syntax for the file format. We also recommend that a
        file or class name and description of purpose be included on the
        same "printed page" as the copyright notice for easier
        identification within third-party archives.
        Copyright [yyyy] [name of copyright owner]
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
        You may obtain a copy of the License at
        http://www.apache.org/licenses/LICENSE-2.0
        Unless required by applicable law or agreed to in writing, software
        distributed under the License is distributed on an "AS IS" BASIS,
        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
        See the License for the specific language governing permissions and
        limitations under the License.
        THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
        REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
        AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
        INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
        LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
        OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
        PERFORMANCE OF THIS SOFTWARE.
        vendor/github.com/oschwald/maxminddb-golang/README.md
        View file @ 534a974d
        # MaxMind DB Reader for Go #
        [![Build Status](https://travis-ci.org/oschwald/maxminddb-golang.png?branch=master)](https://travis-ci.org/oschwald/maxminddb-golang)
        [![GoDoc](https://godoc.org/github.com/oschwald/maxminddb-golang?status.png)](https://godoc.org/github.com/oschwald/maxminddb-golang)
        [![GoDoc](https://godoc.org/github.com/oschwald/maxminddb-golang?status.svg)](https://godoc.org/github.com/oschwald/maxminddb-golang)
        This is a Go reader for the MaxMind DB format. This can be used to read
        [GeoLite2](http://dev.maxmind.com/geoip/geoip2/geolite2/) and
        [GeoIP2](http://www.maxmind.com/en/geolocation_landing) databases.
        This is a Go reader for the MaxMind DB format. Although this can be used to
        read [GeoLite2](http://dev.maxmind.com/geoip/geoip2/geolite2/) and
        [GeoIP2](https://www.maxmind.com/en/geoip2-databases) databases,
        [geoip2](https://github.com/oschwald/geoip2-golang) provides a higher-level
        API for doing so.
        This is not an official MaxMind API.
        ......@@ -33,4 +33,4 @@ with your changes.
        ## License ##
        This is free software, licensed under the Apache License, Version 2.0.
        This is free software, licensed under the ISC License.
        vendor/github.com/oschwald/maxminddb-golang/build.cmd deleted 100644 → 0
        View file @ 4aea0caf
        set GOPATH=%BuildFolder%
        go get -v ./...
        go test -v ./...
        vendor/github.com/oschwald/maxminddb-golang/deserializer.go 0 → 100644
        View file @ 534a974d
        package maxminddb
        import "math/big"
        // deserializer is an interface for a type that deserializes an MaxMind DB
        // data record to some other type. This exists as an alternative to the
        // standard reflection API.
        //
        // This is fundamentally different than the Unmarshaler interface that
        // several packages provide. A Deserializer will generally create the
        // final struct or value rather than unmarshaling to itself.
        //
        // This interface and the associated unmarshaling code is EXPERIMENTAL!
        // It is not currently covered by any Semantic Versioning guarantees.
        // Use at your own risk.
        type deserializer interface {
        ShouldSkip(offset uintptr) (bool, error)
        StartSlice(size uint) error
        StartMap(size uint) error
        End() error
        String(string) error
        Float64(float64) error
        Bytes([]byte) error
        Uint16(uint16) error
        Uint32(uint32) error
        Int32(int32) error
        Uint64(uint64) error
        Uint128(*big.Int) error
        Bool(bool) error
        Float32(float32) error
        }
        vendor/github.com/oschwald/maxminddb-golang/errors.go 0 → 100644
        View file @ 534a974d
        package maxminddb
        import (
        "fmt"
        "reflect"
        )
        // InvalidDatabaseError is returned when the database contains invalid data
        // and cannot be parsed.
        type InvalidDatabaseError struct {
        message string
        }
        func newOffsetError() InvalidDatabaseError {
        return InvalidDatabaseError{"unexpected end of database"}
        }
        func newInvalidDatabaseError(format string, args ...interface{}) InvalidDatabaseError {
        return InvalidDatabaseError{fmt.Sprintf(format, args...)}
        }
        func (e InvalidDatabaseError) Error() string {
        return e.message
        }
        // UnmarshalTypeError is returned when the value in the database cannot be
        // assigned to the specified data type.
        type UnmarshalTypeError struct {
        Value string // stringified copy of the database value that caused the error
        Type reflect.Type // type of the value that could not be assign to
        }
        func newUnmarshalTypeError(value interface{}, rType reflect.Type) UnmarshalTypeError {
        return UnmarshalTypeError{
        Value: fmt.Sprintf("%v", value),
        Type: rType,
        }
        }
        func (e UnmarshalTypeError) Error() string {
        return fmt.Sprintf("maxminddb: cannot unmarshal %s into type %s", e.Value, e.Type.String())
        }
        vendor/github.com/oschwald/maxminddb-golang/go.mod 0 → 100644
        View file @ 534a974d
        module github.com/oschwald/maxminddb-golang
        go 1.9
        require (
        github.com/stretchr/testify v1.6.1
        golang.org/x/sys v0.0.0-20191224085550-c709ea063b76
        )
        vendor/github.com/oschwald/maxminddb-golang/go.sum 0 → 100644
        View file @ 534a974d
        github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
        github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
        github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
        github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
        github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
        github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
        github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
        github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
        golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g=
        golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
        gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
        gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
        gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
        gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
        vendor/github.com/oschwald/maxminddb-golang/mmap_unix.go 0 → 100644
        View file @ 534a974d
        // +build !windows,!appengine,!plan9
        package maxminddb
        import (
        "golang.org/x/sys/unix"
        )
        func mmap(fd, length int) (data []byte, err error) {
        return unix.Mmap(fd, 0, length, unix.PROT_READ, unix.MAP_SHARED)
        }
        func munmap(b []byte) (err error) {
        return unix.Munmap(b)
        }
        vendor/github.com/oschwald/maxminddb-golang/reader_windows.go → vendor/github.com/oschwald/maxminddb-golang/mmap_windows.go
        View file @ 534a974d
        // +build windows,!appengine
        package maxminddb
        // Windows support largely borrowed from mmap-go.
        //
        // Copyright 2011 Evan Shaw. All rights reserved.
        // Use of this source code is governed by a BSD-style
        // license that can be found in the LICENSE file.
        package maxminddb
        import (
        "errors"
        "os"
        "reflect"
        "sync"
        "syscall"
        "unsafe"
        "golang.org/x/sys/windows"
        )
        type MMap []byte
        type memoryMap []byte
        // Windows
        var handleLock sync.Mutex
        var handleMap = map[uintptr]syscall.Handle{}
        var handleMap = map[uintptr]windows.Handle{}
        func mmap(fd int, length int) (data []byte, err error) {
        h, errno := syscall.CreateFileMapping(syscall.Handle(fd), nil,
        uint32(syscall.PAGE_READONLY), 0, uint32(length), nil)
        h, errno := windows.CreateFileMapping(windows.Handle(fd), nil,
        uint32(windows.PAGE_READONLY), 0, uint32(length), nil)
        if h == 0 {
        return nil, os.NewSyscallError("CreateFileMapping", errno)
        }
        addr, errno := syscall.MapViewOfFile(h, uint32(syscall.FILE_MAP_READ), 0,
        addr, errno := windows.MapViewOfFile(h, uint32(windows.FILE_MAP_READ), 0,
        0, uintptr(length))
        if addr == 0 {
        return nil, os.NewSyscallError("MapViewOfFile", errno)
        ......@@ -36,7 +40,7 @@ func mmap(fd int, length int) (data []byte, err error) {
        handleMap[addr] = h
        handleLock.Unlock()
        m := MMap{}
        m := memoryMap{}
        dh := m.header()
        dh.Data = addr
        dh.Len = length
        ......@@ -45,24 +49,24 @@ func mmap(fd int, length int) (data []byte, err error) {
        return m, nil
        }
        func (m *MMap) header() *reflect.SliceHeader {
        func (m *memoryMap) header() *reflect.SliceHeader {
        return (*reflect.SliceHeader)(unsafe.Pointer(m))
        }
        func flush(addr, len uintptr) error {
        errno := syscall.FlushViewOfFile(addr, len)
        errno := windows.FlushViewOfFile(addr, len)
        return os.NewSyscallError("FlushViewOfFile", errno)
        }
        func munmap(b []byte) (err error) {
        m := MMap(b)
        m := memoryMap(b)
        dh := m.header()
        addr := dh.Data
        length := uintptr(dh.Len)
        flush(addr, length)
        err = syscall.UnmapViewOfFile(addr)
        err = windows.UnmapViewOfFile(addr)
        if err != nil {
        return err
        }
        ......@@ -76,6 +80,6 @@ func munmap(b []byte) (err error) {
        }
        delete(handleMap, addr)
        e := syscall.CloseHandle(syscall.Handle(handle))
        e := windows.CloseHandle(windows.Handle(handle))
        return os.NewSyscallError("CloseHandle", e)
        }
        vendor/github.com/oschwald/maxminddb-golang/node.go 0 → 100644
        View file @ 534a974d
        package maxminddb
        type nodeReader interface {
        readLeft(uint) uint
        readRight(uint) uint
        }
        type nodeReader24 struct {
        buffer []byte
        }
        func (n nodeReader24) readLeft(nodeNumber uint) uint {
        return (uint(n.buffer[nodeNumber]) << 16) | (uint(n.buffer[nodeNumber+1]) << 8) | uint(n.buffer[nodeNumber+2])
        }
        func (n nodeReader24) readRight(nodeNumber uint) uint {
        return (uint(n.buffer[nodeNumber+3]) << 16) | (uint(n.buffer[nodeNumber+4]) << 8) | uint(n.buffer[nodeNumber+5])
        }
        type nodeReader28 struct {
        buffer []byte
        }
        func (n nodeReader28) readLeft(nodeNumber uint) uint {
        return ((uint(n.buffer[nodeNumber+3]) & 0xF0) << 20) | (uint(n.buffer[nodeNumber]) << 16) | (uint(n.buffer[nodeNumber+1]) << 8) | uint(n.buffer[nodeNumber+2])
        }
        func (n nodeReader28) readRight(nodeNumber uint) uint {
        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])
        }
        type nodeReader32 struct {
        buffer []byte
        }
        func (n nodeReader32) readLeft(nodeNumber uint) uint {
        return (uint(n.buffer[nodeNum