shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

sd-hwdb: drop caching of search string

Browse Source 
We have only two callers, and for neither this "optimization" is useful.
So let's drop it an save some code and a malloc.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-11-29 15:17:19 -05:00
parent d8646d0572
commit 1cd592b916
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libsystemd/sd-hwdb/sd-hwdb.c
View File

@ -48,8 +48,6 @@ struct sd_hwdb {
const char *map;
};
char *modalias;
OrderedHashmap *properties;
Iterator properties_iterator;
bool properties_modified;
@ -393,7 +391,6 @@ _public_ sd_hwdb *sd_hwdb_unref(sd_hwdb *hwdb) {
if (hwdb->map)
munmap((void *)hwdb->map, hwdb->st.st_size);
safe_fclose(hwdb->f);
free(hwdb->modalias);
ordered_hashmap_free(hwdb->properties);
free(hwdb);
}
@ -427,32 +424,13 @@ bool hwdb_validate(sd_hwdb *hwdb) {
}
static int properties_prepare(sd_hwdb *hwdb, const char *modalias) {
_cleanup_free_ char *mod = NULL;
int r;
assert(hwdb);
assert(modalias);
if (streq_ptr(modalias, hwdb->modalias))
return 0;
mod = strdup(modalias);
if (!mod)
return -ENOMEM;
ordered_hashmap_clear(hwdb->properties);
hwdb->properties_modified = true;
r = trie_search_f(hwdb, modalias);
if (r < 0)
return r;
free(hwdb->modalias);
hwdb->modalias = mod;
mod = NULL;
return 0;
return trie_search_f(hwdb, modalias);
}
_public_ int sd_hwdb_get(sd_hwdb *hwdb, const char *modalias, const char *key, const char **_value) {