Skip to content

Commit fc94cb4

Browse files
committed
Fix: minor fixes
1 parent c7be044 commit fc94cb4

4 files changed

Lines changed: 7 additions & 18 deletions

File tree

lib/entry.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,6 @@ func (e *Entry) hasIPv6Set() bool {
4343
return e.ipv6Set != nil
4444
}
4545

46-
// resetIPv4Set discards the cached IPv4 set, so that it will be rebuilt
47-
// from the builder on the next use.
48-
func (e *Entry) resetIPv4Set() {
49-
e.ipv4Set = nil
50-
}
51-
52-
// resetIPv6Set discards the cached IPv6 set, so that it will be rebuilt
53-
// from the builder on the next use.
54-
func (e *Entry) resetIPv6Set() {
55-
e.ipv6Set = nil
56-
}
57-
5846
func (e *Entry) GetIPv4Set() (*netipx.IPSet, error) {
5947
if err := e.buildIPSet(); err != nil {
6048
return nil, err

plugin/maxmind/maxmind_country_mmdb_out.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,13 +380,16 @@ func (g *GeoLite2CountryMMDBOut) writeFile(filename string, writer *mmdbwriter.T
380380
if err != nil {
381381
return err
382382
}
383-
defer f.Close()
384383

385384
_, err = writer.WriteTo(f)
386385
if err != nil {
387386
return err
388387
}
389388

389+
if err = f.Close(); err != nil {
390+
return err
391+
}
392+
390393
log.Printf("✅ [%s] %s --> %s", g.Type, filename, g.OutputDir)
391394

392395
return nil

plugin/mihomo/mrs_out.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,12 @@ func (m *MRSOut) writeFile(filename string, ipRanges []netipx.IPRange) error {
165165
return err
166166
}
167167

168-
defer f.Close()
169-
170168
err = m.convertToMrs(ipRanges, f)
171169
if err != nil {
172170
return err
173171
}
174172

175-
if err := f.Close(); err != nil {
173+
if err = f.Close(); err != nil {
176174
return err
177175
}
178176

@@ -186,6 +184,7 @@ func (m *MRSOut) convertToMrs(ipRanges []netipx.IPRange, w io.Writer) (err error
186184
if err != nil {
187185
return err
188186
}
187+
189188
defer func() {
190189
if closeErr := encoder.Close(); closeErr != nil && err == nil {
191190
err = closeErr

plugin/singbox/srs_out.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,13 @@ func (s *SRSOut) writeFile(filename string, ruleset *option.PlainRuleSet) error
183183
if err != nil {
184184
return err
185185
}
186-
defer f.Close()
187186

188187
err = srs.Write(f, *ruleset, constant.RuleSetVersion1)
189188
if err != nil {
190189
return err
191190
}
192191

193-
if err := f.Close(); err != nil {
192+
if err = f.Close(); err != nil {
194193
return err
195194
}
196195

0 commit comments

Comments
 (0)