From c36cba5bc1c783f87b0ada8a8b42303bfadeaf0a Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 5 Jun 2013 19:20:52 -0400 Subject: Remove unused functions from src/libudev/{conf-files,exit-status,hashmap,log,path-util,set,strv}.c A lot of upstream commits cross many boundaries between systemd code and udev code. The point of intersection is upstreams src/shared folder. The best way we find to track them is to apply their commits to udev and libudev and then just pick remove functions from the shared folder. Its timely but it gives us the best control over what gets in and what doesnt. In this commit we removed the following functions: conf_files_list_nulstr exit_status_to_string is_clean_exit_lsb uint64_hash_func uint64_compare_func hashmap_free_free_free hashmap_update hashmap_get2 hashmap_remove_and_replace hashmap_remove_value hashmap_steal_first_key hashmap_next log_forget_fds log_set_facility log_meta_object log_struct_internal log_set_target_from_string log_set_max_level_from_string log_get_target log_get_max_level log_show_color_from_string log_show_location_from_string log_on_console is_path path_split_and_make_absolute set_ensure_allocated set_replace set_remove_and_put set_size set_isempty set_iterate_skip set_steal_first set_first set_last set_merge set_move_one set_copy set_clear_free set_get_strv strv_find_prefix strv_merge_concat strv_split_newlines strv_join strv_remove_prefix strv_parse_nulstr strv_overlap strv_sort strv_print Signed-off-by: Anthony G. Basile --- src/libudev/hashmap.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/libudev/hashmap.h') diff --git a/src/libudev/hashmap.h b/src/libudev/hashmap.h index 15b7e27585..d9995dbda5 100644 --- a/src/libudev/hashmap.h +++ b/src/libudev/hashmap.h @@ -50,25 +50,19 @@ unsigned trivial_hash_func(const void *p) _const_; int trivial_compare_func(const void *a, const void *b) _const_; unsigned uint64_hash_func(const void *p) _pure_; -int uint64_compare_func(const void *a, const void *b) _pure_; Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func); void hashmap_free(Hashmap *h); void hashmap_free_free(Hashmap *h); -void hashmap_free_free_free(Hashmap *h); Hashmap *hashmap_copy(Hashmap *h); int hashmap_ensure_allocated(Hashmap **h, hash_func_t hash_func, compare_func_t compare_func); int hashmap_put(Hashmap *h, const void *key, void *value); -int hashmap_update(Hashmap *h, const void *key, void *value); int hashmap_replace(Hashmap *h, const void *key, void *value); void *hashmap_get(Hashmap *h, const void *key); -void *hashmap_get2(Hashmap *h, const void *key, void **rkey); bool hashmap_contains(Hashmap *h, const void *key); void *hashmap_remove(Hashmap *h, const void *key); -void *hashmap_remove_value(Hashmap *h, const void *key, void *value); int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value); -int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value); int hashmap_merge(Hashmap *h, Hashmap *other); void hashmap_move(Hashmap *h, Hashmap *other); @@ -86,13 +80,10 @@ void hashmap_clear_free(Hashmap *h); void hashmap_clear_free_free(Hashmap *h); void *hashmap_steal_first(Hashmap *h); -void *hashmap_steal_first_key(Hashmap *h); void *hashmap_first(Hashmap *h) _pure_; void *hashmap_first_key(Hashmap *h) _pure_; void *hashmap_last(Hashmap *h) _pure_; -void *hashmap_next(Hashmap *h, const void *key); - char **hashmap_get_strv(Hashmap *h); #define HASHMAP_FOREACH(e, h, i) \ -- cgit v1.2.3-54-g00ecf