@@ -111,30 +111,21 @@ type ISP struct {
111
111
// using the Open function.
112
112
type Reader struct {
113
113
mmdbReader * maxminddb.Reader
114
- metadata * maxminddb.Metadata
115
114
}
116
115
117
116
// Open takes a string path to a file and returns a Reader structure or an
118
117
// error. The database file is opened using a memory map. Use the Close method
119
118
// on the Reader object to return the resources to the system.
120
119
func Open (file string ) (* Reader , error ) {
121
120
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
127
122
}
128
123
129
124
// FromBytes takes a byte slice corresponding to a GeoIP2/GeoLite2 database
130
125
// file and returns a Reader structure or an error.
131
126
func FromBytes (bytes []byte ) (* Reader , error ) {
132
127
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
138
129
}
139
130
140
131
// 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) {
183
174
// Metadata takes no arguments and returns a struct containing metadata about
184
175
// the Maxmind database in use by the Reader.
185
176
func (r * Reader ) Metadata () * maxminddb.Metadata {
186
- return r . metadata
177
+ return & r . mmdbReader . Metadata
187
178
}
188
179
189
180
// Close unmaps the database file from virtual memory and returns the
0 commit comments