libnetwork/datastore: Store.Map, Store.List: remove intermediate vars

Inline the closures, and rename a var to be more descriptive.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-16 16:30:38 +02:00
parent 605c8fb75d
commit a384102fdf
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C

View file

@ -290,10 +290,9 @@ func (ds *Store) List(key string, kvObject KVObject) ([]KVObject, error) {
}
var kvol []KVObject
cb := func(key string, val KVObject) {
err := ds.iterateKVPairsFromStore(key, kvObject, func(key string, val KVObject) {
kvol = append(kvol, val)
}
err := ds.iterateKVPairsFromStore(key, kvObject, cb)
})
if err != nil {
return nil, err
}
@ -341,16 +340,15 @@ func (ds *Store) Map(key string, kvObject KVObject) (map[string]KVObject, error)
ds.mu.Lock()
defer ds.mu.Unlock()
kvol := make(map[string]KVObject)
cb := func(key string, val KVObject) {
results := map[string]KVObject{}
err := ds.iterateKVPairsFromStore(key, kvObject, func(key string, val KVObject) {
// Trim the leading & trailing "/" to make it consistent across all stores
kvol[strings.Trim(key, "/")] = val
}
err := ds.iterateKVPairsFromStore(key, kvObject, cb)
results[strings.Trim(key, "/")] = val
})
if err != nil {
return nil, err
}
return kvol, nil
return results, nil
}
// DeleteObjectAtomic performs atomic delete on a record.