morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

set: rename _set_ensure_allocated() -> set_ensure_allocated()

Browse Source 
Follow-ups for c09ce222b6.
This commit is contained in:
Yu Watanabe
2025-05-08 02:10:31 +09:00
parent f24f70343d
commit 54bbfa007d
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/basic/hashmap.c
View File

@@ -843,7 +843,7 @@ int ordered_hashmap_ensure_allocated(OrderedHashmap **h, const struct hash_ops *
return hashmap_base_ensure_allocated((HashmapBase**)h, hash_ops, HASHMAP_TYPE_ORDERED);
}
int _set_ensure_allocated(Set **s, const struct hash_ops *hash_ops) {
int set_ensure_allocated(Set **s, const struct hash_ops *hash_ops) {
return hashmap_base_ensure_allocated((HashmapBase**)s, hash_ops, HASHMAP_TYPE_SET);
}
@@ -1285,7 +1285,7 @@ int set_put(Set *s, const void *key) {
int set_ensure_put(Set **s, const struct hash_ops *hash_ops, const void *key) {
int r;
r = _set_ensure_allocated(s, hash_ops);
r = set_ensure_allocated(s, hash_ops);
if (r < 0)
return r;
@@ -1883,7 +1883,7 @@ int set_put_strndup_full(Set **s, const struct hash_ops *hash_ops, const char *p
assert(s);
assert(p);
r = _set_ensure_allocated(s, hash_ops);
r = set_ensure_allocated(s, hash_ops);
if (r < 0)
return r;

5
src/basic/set.h
View File

@@ -16,8 +16,7 @@ static inline Set* set_free(Set *s) {
#define set_copy(s) ((Set*) _hashmap_copy(HASHMAP_BASE(s)))
int _set_ensure_allocated(Set **s, const struct hash_ops *hash_ops);
#define set_ensure_allocated(h, ops) _set_ensure_allocated(h, ops)
int set_ensure_allocated(Set **s, const struct hash_ops *hash_ops);
int set_put(Set *s, const void *key);
/* no set_update */
@@ -103,7 +102,7 @@ int set_put_strndup_full(Set **s, const struct hash_ops *hash_ops, const char *p
#define set_put_strndup(s, p, n) set_put_strndup_full(s, &string_hash_ops_free, p, n)
#define set_put_strdup(s, p) set_put_strndup(s, p, SIZE_MAX)
int set_put_strdupv_full(Set **s, const struct hash_ops *hash_ops, char **l );
int set_put_strdupv_full(Set **s, const struct hash_ops *hash_ops, char **l);
#define set_put_strdupv(s, l) set_put_strdupv_full(s, &string_hash_ops_free, l)
int set_put_strsplit(Set *s, const char *v, const char *separators, ExtractFlags flags);