Skip to content

Commit 979a13e

Browse files
committed
Rename variable 'include' -> 'missingIncludeH'
1 parent 28378b6 commit 979a13e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

legacy/builder/container_find_includes.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,9 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
335335
var preprocErr error
336336
var preprocStderr []byte
337337

338-
var include string
338+
var missingIncludeH string
339339
if unchanged && cache.valid {
340-
include = cache.Next().Include
340+
missingIncludeH = cache.Next().Include
341341
if first && ctx.Verbose {
342342
ctx.Info(tr("Using cached library dependencies for file: %[1]s", sourcePath))
343343
}
@@ -346,25 +346,25 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
346346
// Unwrap error and see if it is an ExitError.
347347
if preprocErr == nil {
348348
// Preprocessor successful, done
349-
include = ""
349+
missingIncludeH = ""
350350
} else if _, isExitErr := errors.Cause(preprocErr).(*exec.ExitError); !isExitErr || preprocStderr == nil {
351351
// Ignore ExitErrors (e.g. gcc returning non-zero status), but bail out on other errors
352352
return errors.WithStack(preprocErr)
353353
} else {
354-
include = IncludesFinderWithRegExp(string(preprocStderr))
355-
if include == "" && ctx.Verbose {
354+
missingIncludeH = IncludesFinderWithRegExp(string(preprocStderr))
355+
if missingIncludeH == "" && ctx.Verbose {
356356
ctx.Info(tr("Error while detecting libraries included by %[1]s", sourcePath))
357357
}
358358
}
359359
}
360360

361-
if include == "" {
361+
if missingIncludeH == "" {
362362
// No missing includes found, we're done
363363
cache.ExpectEntry(sourcePath, "", nil)
364364
return nil
365365
}
366366

367-
library := ResolveLibrary(ctx, include)
367+
library := ResolveLibrary(ctx, missingIncludeH)
368368
if library == nil {
369369
// Library could not be resolved, show error
370370
// err := runCommand(ctx, &GCCPreprocRunner{SourceFilePath: sourcePath, TargetFileName: paths.New(constants.FILE_CTAGS_TARGET_FOR_GCC_MINUS_E), Includes: includes})
@@ -388,7 +388,7 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile *
388388
// include path and queue its source files for further
389389
// include scanning
390390
ctx.ImportedLibraries = append(ctx.ImportedLibraries, library)
391-
appendIncludeFolder(ctx, cache, sourcePath, include, library.SourceDir)
391+
appendIncludeFolder(ctx, cache, sourcePath, missingIncludeH, library.SourceDir)
392392
sourceDirs := library.SourceDirs()
393393
for _, sourceDir := range sourceDirs {
394394
queueSourceFilesFromFolder(ctx, ctx.CollectedSourceFiles, library, sourceDir.Dir, sourceDir.Recurse)

0 commit comments

Comments
 (0)