]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #15940 from keszybz/names-set-optimization
authorLennart Poettering <lennart@poettering.net>
Wed, 10 Jun 2020 16:52:08 +0000 (18:52 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Jun 2020 16:52:08 +0000 (18:52 +0200)
Try to optimize away Unit.names set

1  2 
src/basic/hashmap.c
src/core/load-dropin.c
src/core/socket.c
src/core/socket.h
src/core/unit.c
src/core/unit.h
src/systemctl/systemctl.c

index 3172865e3e2a4725bd8598a8a9c3e8d87f78c0dd,b45938cd3bc37b1485288800466b1c0ebcd75327..15c8c4723c0480a2499da376d88f8bd50eb844e8
@@@ -833,10 -835,10 +833,10 @@@ static int hashmap_base_ensure_allocate
                  return -ENOMEM;
  
          *h = q;
-         return 0;
+         return 1;
  }
  
 -int internal_hashmap_ensure_allocated(Hashmap **h, const struct hash_ops *hash_ops  HASHMAP_DEBUG_PARAMS) {
 +int _hashmap_ensure_allocated(Hashmap **h, const struct hash_ops *hash_ops  HASHMAP_DEBUG_PARAMS) {
          return hashmap_base_ensure_allocated((HashmapBase**)h, hash_ops, HASHMAP_TYPE_PLAIN HASHMAP_DEBUG_PASS_ARGS);
  }
  
Simple merge
Simple merge
Simple merge
diff --cc src/core/unit.c
Simple merge
diff --cc src/core/unit.h
Simple merge
Simple merge