Skip to content

Commit d0d9f6a

Browse files
committed
update remaining file variable names to avoid shadowing in the future
Signed-off-by: egibs <20933572+egibs@users.noreply.github.com>
1 parent 6864d87 commit d0d9f6a

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/action/scan_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ func TestCleanPath(t *testing.T) {
7777
}
7878

7979
filePath := filepath.Join(nestedDir, "test.txt")
80-
file, err := os.Create(filePath)
80+
f, err := os.Create(filePath)
8181
if err != nil {
8282
t.Fatalf("failed to create file: %v", err)
8383
}
84-
file.Close()
84+
defer f.Close()
8585

8686
fullPath := filepath.Join(tempDir, tt.path)
8787
fullPrefix := filepath.Join(tempDir, tt.prefix)

pkg/compile/compile.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ func getCacheDir() (string, error) {
245245

246246
// loadCachedRules attempts to load rules from the local, compiled rules.
247247
func loadCachedRules(cacheFile string) (*yarax.Rules, error) {
248-
file, err := os.Open(cacheFile)
248+
f, err := os.Open(cacheFile)
249249
if err != nil {
250250
return nil, err
251251
}
252-
defer file.Close()
252+
defer f.Close()
253253

254-
compiledRules, err := yarax.ReadFrom(file)
254+
compiledRules, err := yarax.ReadFrom(f)
255255
if err != nil {
256256
return nil, fmt.Errorf("read cached rules: %w", err)
257257
}
@@ -262,13 +262,13 @@ func loadCachedRules(cacheFile string) (*yarax.Rules, error) {
262262
// saveCachedRules saves rules to a local file.
263263
func saveCachedRules(compiledRules *yarax.Rules, cacheFile string) error {
264264
tmpFile := cacheFile + ".tmp"
265-
file, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
265+
f, err := os.OpenFile(tmpFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
266266
if err != nil {
267267
return fmt.Errorf("create cache file: %w", err)
268268
}
269-
defer file.Close()
269+
defer f.Close()
270270

271-
if _, err := compiledRules.WriteTo(file); err != nil {
271+
if _, err := compiledRules.WriteTo(f); err != nil {
272272
os.Remove(tmpFile)
273273
return fmt.Errorf("write rules to cache: %w", err)
274274
}

0 commit comments

Comments
 (0)