aboutsummaryrefslogtreecommitdiff
path: root/classifier.go
diff options
context:
space:
mode:
authorBill Wendling <morbo@google.com>2017-09-20 22:17:14 -0700
committerBill Wendling <morbo@google.com>2017-09-20 22:17:14 -0700
commit0c9a1b19bedc4a28d55ab5760576d66c3152cdb2 (patch)
tree678b1058f5e6a66625bc6de23f1585ad4d1e1e98 /classifier.go
parentb4bef120db43d350999163efd6bb991c9e68b59d (diff)
downloadlicenseclassifier-0c9a1b19bedc4a28d55ab5760576d66c3152cdb2.tar.gz
Update to use the proper path for ReadLicenseFile
Diffstat (limited to 'classifier.go')
-rw-r--r--classifier.go17
1 files changed, 5 insertions, 12 deletions
diff --git a/classifier.go b/classifier.go
index cc9bf42..63d07c3 100644
--- a/classifier.go
+++ b/classifier.go
@@ -242,7 +242,6 @@ func (c *License) registerLicenses(archive string) error {
var muVals sync.Mutex
var vals []archivedValue
- var wg sync.WaitGroup
for i := 0; ; i++ {
hdr, err := tr.Next()
if err == io.EOF {
@@ -272,19 +271,13 @@ func (c *License) registerLicenses(archive string) error {
return err
}
- wg.Add(1)
- go func(name, normalized string) {
- defer wg.Done()
+ var set searchset.SearchSet
+ searchset.Deserialize(&b, &set)
- var set searchset.SearchSet
- searchset.Deserialize(&b, &set)
-
- muVals.Lock()
- vals = append(vals, archivedValue{name, normalized, &set})
- muVals.Unlock()
- }(name, normalized)
+ muVals.Lock()
+ vals = append(vals, archivedValue{name, normalized, &set})
+ muVals.Unlock()
}
- wg.Wait()
for _, v := range vals {
if err = c.c.AddPrecomputedValue(v.name, v.normalized, v.set); err != nil {