Ensure AddLibrariesDir do not share input parameters

Author: cmaglie

Diff for: commands/instances.go

@@ -307,7 +307,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 	for _, pack := range pme.GetPackages() {
 		for _, platform := range pack.Platforms {
 			if platformRelease := pme.GetInstalledPlatformRelease(platform); platformRelease != nil {
-				lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+				lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 					PlatformRelease: platformRelease,
 					Path:            platformRelease.GetLibrariesDir(),
 					Location:        libraries.PlatformBuiltIn,
@@ -335,14 +335,14 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 	if profile == nil {
 		// Add directories of libraries bundled with IDE
 		if bundledLibsDir := configuration.IDEBuiltinLibrariesDir(configuration.Settings); bundledLibsDir != nil {
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:     bundledLibsDir,
 				Location: libraries.IDEBuiltIn,
 			})
 		}
 
 		// Add libraries directory from config file
-		lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+		lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 			Path:     configuration.LibrariesDir(configuration.Settings),
 			Location: libraries.User,
 		})
@@ -382,7 +382,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 				taskCallback(&rpc.TaskProgress{Completed: true})
 			}
 
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:     libRoot,
 				Location: libraries.User,
 			})

Diff for: internal/arduino/builder/internal/detector/detector.go

@@ -608,20 +608,20 @@ func LibrariesLoader(
 			if err := builtInLibrariesFolders.ToAbs(); err != nil {
 				return nil, nil, nil, err
 			}
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:     builtInLibrariesFolders,
 				Location: libraries.IDEBuiltIn,
 			})
 		}
 
 		if actualPlatform != targetPlatform {
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				PlatformRelease: actualPlatform,
 				Path:            actualPlatform.GetLibrariesDir(),
 				Location:        libraries.ReferencedPlatformBuiltIn,
 			})
 		}
-		lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+		lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 			PlatformRelease: targetPlatform,
 			Path:            targetPlatform.GetLibrariesDir(),
 			Location:        libraries.PlatformBuiltIn,
@@ -632,14 +632,14 @@ func LibrariesLoader(
 			return nil, nil, nil, err
 		}
 		for _, folder := range librariesFolders {
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:     folder,
 				Location: libraries.User, // XXX: Should be libraries.Unmanaged?
 			})
 		}
 
 		for _, dir := range libraryDirs {
-			lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
+			lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
 				Path:            dir,
 				Location:        libraries.Unmanaged,
 				IsSingleLibrary: true,

Diff for: internal/arduino/libraries/librariesmanager/librariesmanager.go

@@ -55,7 +55,7 @@ type Installer struct {
 // (the list of libraries, revisions, installed paths, etc.)
 type LibrariesManager struct {
 	librariesLock sync.RWMutex
-	librariesDir  []*LibrariesDir
+	librariesDir  []LibrariesDir
 	libraries     map[string]libraries.List
 }
 
@@ -131,7 +131,7 @@ func (lmb *Builder) Build() (*LibrariesManager, []*status.Status) {
 	res := &LibrariesManager{}
 	for _, dir := range res.librariesDir {
 		if !dir.scanned {
-			if errs := lmb.loadLibrariesFromDir(dir); len(errs) > 0 {
+			if errs := lmb.loadLibrariesFromDir(&dir); len(errs) > 0 {
 				statuses = append(statuses, errs...)
 			}
 		}
@@ -152,7 +152,7 @@ func (lmb *Builder) BuildIntoExistingLibrariesManager(old *LibrariesManager) {
 // AddLibrariesDir adds path to the list of directories
 // to scan when searching for libraries. If a path is already
 // in the list it is ignored.
-func (lmb *Builder) AddLibrariesDir(libDir *LibrariesDir) {
+func (lmb *Builder) AddLibrariesDir(libDir LibrariesDir) {
 	if libDir.Path == nil {
 		return
 	}
@@ -173,7 +173,7 @@ func (lmi *Installer) RescanLibraries() []*status.Status {
 	lmi.libraries = map[string]libraries.List{}
 	statuses := []*status.Status{}
 	for _, dir := range lmi.librariesDir {
-		if errs := lmi.loadLibrariesFromDir(dir); len(errs) > 0 {
+		if errs := lmi.loadLibrariesFromDir(&dir); len(errs) > 0 {
 			statuses = append(statuses, errs...)
 		}
 	}