Skip to content

Commit 2370b92

Browse files
author
Andrew Look
committed
removing extra mmdb Metadata pointer
1 parent 4b4c289 commit 2370b92

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

reader.go

+3-12
Original file line numberDiff line numberDiff line change
@@ -111,30 +111,21 @@ type ISP struct {
111111
// using the Open function.
112112
type Reader struct {
113113
mmdbReader *maxminddb.Reader
114-
metadata *maxminddb.Metadata
115114
}
116115

117116
// Open takes a string path to a file and returns a Reader structure or an
118117
// error. The database file is opened using a memory map. Use the Close method
119118
// on the Reader object to return the resources to the system.
120119
func Open(file string) (*Reader, error) {
121120
reader, err := maxminddb.Open(file)
122-
if err == nil {
123-
return &Reader{mmdbReader: reader, metadata: &reader.Metadata}, err
124-
} else {
125-
return &Reader{mmdbReader: reader}, err
126-
}
121+
return &Reader{mmdbReader: reader}, err
127122
}
128123

129124
// FromBytes takes a byte slice corresponding to a GeoIP2/GeoLite2 database
130125
// file and returns a Reader structure or an error.
131126
func FromBytes(bytes []byte) (*Reader, error) {
132127
reader, err := maxminddb.FromBytes(bytes)
133-
if err == nil {
134-
return &Reader{mmdbReader: reader, metadata: &reader.Metadata}, err
135-
} else {
136-
return &Reader{mmdbReader: reader}, err
137-
}
128+
return &Reader{mmdbReader: reader}, err
138129
}
139130

140131
// City takes an IP address as a net.IP struct and returns a City struct
@@ -183,7 +174,7 @@ func (r *Reader) ISP(ipAddress net.IP) (*ISP, error) {
183174
// Metadata takes no arguments and returns a struct containing metadata about
184175
// the Maxmind database in use by the Reader.
185176
func (r *Reader) Metadata() *maxminddb.Metadata {
186-
return r.metadata
177+
return &r.mmdbReader.Metadata
187178
}
188179

189180
// Close unmaps the database file from virtual memory and returns the

0 commit comments

Comments
 (0)