FindFilesInFolder now returns the result instead of changine the reference

Author: cmaglie

legacy/builder/container_find_includes.go

@@ -409,8 +409,7 @@ func (f *CppIncludesFinder) findIncludesUntilDone(sourceFile *SourceFile) error
 func (f *CppIncludesFinder) queueSourceFilesFromFolder(srcDir, buildDir *paths.Path, recurse bool) error {
 	extensions := func(ext string) bool { return ADDITIONAL_FILE_VALID_EXTENSIONS_NO_HEADERS[ext] }
 	f.log.Debugf("  Queueing source files from %s (recurse %v)", srcDir, recurse)
-	filePaths := []string{}
-	err := utils.FindFilesInFolder(&filePaths, srcDir.String(), extensions, recurse)
+	filePaths, err := utils.FindFilesInFolder(srcDir.String(), extensions, recurse)
 	if err != nil {
 		return errors.WithStack(err)
 	}

legacy/builder/create_cmake_rule.go

@@ -93,8 +93,7 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 		}
 
 		// Remove stray folders contining incompatible or not needed libraries archives
-		var files []string
-		utils.FindFilesInFolder(&files, libDir.Join("src").String(), staticLibsExtensions, true)
+		files, _ := utils.FindFilesInFolder(libDir.Join("src").String(), staticLibsExtensions, true)
 		for _, file := range files {
 			staticLibDir := filepath.Dir(file)
 			if !isStaticLib || !strings.Contains(staticLibDir, mcu) {
@@ -130,8 +129,7 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 	}
 
 	// remove "#line 1 ..." from exported c_make folder sketch
-	var sketchFiles []string
-	utils.FindFilesInFolder(&sketchFiles, cmakeFolder.Join("sketch").String(), extensions, false)
+	sketchFiles, _ := utils.FindFilesInFolder(cmakeFolder.Join("sketch").String(), extensions, false)
 
 	for _, file := range sketchFiles {
 		input, err := ioutil.ReadFile(file)
@@ -165,14 +163,12 @@ func (s *ExportProjectCMake) Run(ctx *types.Context) error {
 	extractCompileFlags(ctx, constants.RECIPE_CPP_PATTERN, &defines, &dynamicLibsFromGccMinusL, &linkerflags, &linkDirectories, logger)
 
 	// Extract folders with .h in them for adding in include list
-	var headerFiles []string
 	isHeader := func(ext string) bool { return DOTHEXTENSION[ext] }
-	utils.FindFilesInFolder(&headerFiles, cmakeFolder.String(), isHeader, true)
+	headerFiles, _ := utils.FindFilesInFolder(cmakeFolder.String(), isHeader, true)
 	foldersContainingDotH := findUniqueFoldersRelative(headerFiles, cmakeFolder.String())
 
 	// Extract folders with .a in them for adding in static libs paths list
-	var staticLibs []string
-	utils.FindFilesInFolder(&staticLibs, cmakeFolder.String(), staticLibsExtensions, true)
+	staticLibs, _ := utils.FindFilesInFolder(cmakeFolder.String(), staticLibsExtensions, true)
 
 	// Generate the CMakeLists global file
 

legacy/builder/phases/libraries_builder.go

@@ -120,12 +120,11 @@ func fixLDFLAGforPrecompiledLibraries(ctx *types.Context, libs libraries.List) e
 				break
 			}
 			// find all library names in the folder and prepend -l
-			filePaths := []string{}
 			libs_cmd := library.LDflags + " "
 			extensions := func(ext string) bool {
 				return PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_DYNAMIC[ext] || PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC[ext]
 			}
-			utils.FindFilesInFolder(&filePaths, path.String(), extensions, false)
+			filePaths, _ := utils.FindFilesInFolder(path.String(), extensions, false)
 			for _, lib := range filePaths {
 				name := strings.TrimSuffix(filepath.Base(lib), filepath.Ext(lib))
 				// strip "lib" first occurrence
@@ -178,13 +177,12 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 		// search for files with PRECOMPILED_LIBRARIES_VALID_EXTENSIONS
 		extensions := func(ext string) bool { return PRECOMPILED_LIBRARIES_VALID_EXTENSIONS_STATIC[ext] }
 
-		filePaths := []string{}
 		precompiledPath := findExpectedPrecompiledLibFolder(ctx, library)
 		if precompiledPath != nil {
 			// TODO: This codepath is just taken for .a with unusual names that would
 			// be ignored by -L / -l methods.
 			// Should we force precompiled libraries to start with "lib" ?
-			err := utils.FindFilesInFolder(&filePaths, precompiledPath.String(), extensions, false)
+			filePaths, err := utils.FindFilesInFolder(precompiledPath.String(), extensions, false)
 			if err != nil {
 				return nil, errors.WithStack(err)
 			}

legacy/builder/sketch_loader.go

@@ -73,11 +73,10 @@ func (s *SketchLoader) Run(ctx *types.Context) error {
 }
 
 func collectAllSketchFiles(from *paths.Path) (paths.PathList, error) {
-	filePaths := []string{}
 	// Source files in the root are compiled, non-recursively. This
 	// is the only place where .ino files can be present.
 	rootExtensions := func(ext string) bool { return MAIN_FILE_VALID_EXTENSIONS[ext] || ADDITIONAL_FILE_VALID_EXTENSIONS[ext] }
-	err := utils.FindFilesInFolder(&filePaths, from.String(), rootExtensions, true /* recurse */)
+	filePaths, err := utils.FindFilesInFolder(from.String(), rootExtensions, true /* recurse */)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}

legacy/builder/utils/utils.go

@@ -343,7 +343,8 @@ func FindAllSubdirectories(folder string, output *[]string) error {
 	return gohasissues.Walk(folder, walkFunc)
 }
 
-func FindFilesInFolder(files *[]string, folder string, extensions CheckExtensionFunc, recurse bool) error {
+func FindFilesInFolder(folder string, extensions CheckExtensionFunc, recurse bool) ([]string, error) {
+	files := []string{}
 	walkFunc := func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -379,10 +380,11 @@ func FindFilesInFolder(files *[]string, folder string, extensions CheckExtension
 		}
 		currentFile.Close()
 
-		*files = append(*files, path)
+		files = append(files, path)
 		return nil
 	}
-	return gohasissues.Walk(folder, walkFunc)
+	err := gohasissues.Walk(folder, walkFunc)
+	return files, err
 }
 
 func AppendIfNotPresent(target []string, elements ...string) []string {