Skip to content

Commit 645c398

Browse files
committed
Ensure AddLibrariesDir do not share input parameters
1 parent fe1ca8a commit 645c398

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Diff for: commands/instances.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
307307
for _, pack := range pme.GetPackages() {
308308
for _, platform := range pack.Platforms {
309309
if platformRelease := pme.GetInstalledPlatformRelease(platform); platformRelease != nil {
310-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
310+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
311311
PlatformRelease: platformRelease,
312312
Path: platformRelease.GetLibrariesDir(),
313313
Location: libraries.PlatformBuiltIn,
@@ -335,14 +335,14 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
335335
if profile == nil {
336336
// Add directories of libraries bundled with IDE
337337
if bundledLibsDir := configuration.IDEBuiltinLibrariesDir(configuration.Settings); bundledLibsDir != nil {
338-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
338+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
339339
Path: bundledLibsDir,
340340
Location: libraries.IDEBuiltIn,
341341
})
342342
}
343343

344344
// Add libraries directory from config file
345-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
345+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
346346
Path: configuration.LibrariesDir(configuration.Settings),
347347
Location: libraries.User,
348348
})
@@ -382,7 +382,7 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
382382
taskCallback(&rpc.TaskProgress{Completed: true})
383383
}
384384

385-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
385+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
386386
Path: libRoot,
387387
Location: libraries.User,
388388
})

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -608,20 +608,20 @@ func LibrariesLoader(
608608
if err := builtInLibrariesFolders.ToAbs(); err != nil {
609609
return nil, nil, nil, err
610610
}
611-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
611+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
612612
Path: builtInLibrariesFolders,
613613
Location: libraries.IDEBuiltIn,
614614
})
615615
}
616616

617617
if actualPlatform != targetPlatform {
618-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
618+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
619619
PlatformRelease: actualPlatform,
620620
Path: actualPlatform.GetLibrariesDir(),
621621
Location: libraries.ReferencedPlatformBuiltIn,
622622
})
623623
}
624-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
624+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
625625
PlatformRelease: targetPlatform,
626626
Path: targetPlatform.GetLibrariesDir(),
627627
Location: libraries.PlatformBuiltIn,
@@ -632,14 +632,14 @@ func LibrariesLoader(
632632
return nil, nil, nil, err
633633
}
634634
for _, folder := range librariesFolders {
635-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
635+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
636636
Path: folder,
637637
Location: libraries.User, // XXX: Should be libraries.Unmanaged?
638638
})
639639
}
640640

641641
for _, dir := range libraryDirs {
642-
lmb.AddLibrariesDir(&librariesmanager.LibrariesDir{
642+
lmb.AddLibrariesDir(librariesmanager.LibrariesDir{
643643
Path: dir,
644644
Location: libraries.Unmanaged,
645645
IsSingleLibrary: true,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func NewBuilder() *Builder {
9898

9999
// Clone creates a Builder starting with a copy of the same configuration
100100
// of this LibrariesManager. At the moment of the Build() only the added
101-
// libraries directories will be scanned, keeping the exising directories
101+
// libraries directories will be scanned, keeping the existing directories
102102
// "cached" to optimize scan. If you need to do a full rescan you must use
103103
// the RescanLibraries method of the Installer.
104104
func (lm *LibrariesManager) Clone() *Builder {
@@ -152,7 +152,7 @@ func (lmb *Builder) BuildIntoExistingLibrariesManager(old *LibrariesManager) {
152152
// AddLibrariesDir adds path to the list of directories
153153
// to scan when searching for libraries. If a path is already
154154
// in the list it is ignored.
155-
func (lmb *Builder) AddLibrariesDir(libDir *LibrariesDir) {
155+
func (lmb *Builder) AddLibrariesDir(libDir LibrariesDir) {
156156
if libDir.Path == nil {
157157
return
158158
}
@@ -165,7 +165,7 @@ func (lmb *Builder) AddLibrariesDir(libDir *LibrariesDir) {
165165
WithField("location", libDir.Location.String()).
166166
WithField("isSingleLibrary", libDir.IsSingleLibrary).
167167
Info("Adding libraries dir")
168-
lmb.librariesDir = append(lmb.librariesDir, libDir)
168+
lmb.librariesDir = append(lmb.librariesDir, &libDir)
169169
}
170170

171171
// RescanLibraries reload all installed libraries in the system.

0 commit comments

Comments
 (0)