1
1

libnbc: remove some stale/dead code

Gcc 8 identified hb_tree_csearch() as an infinite recursion, and it
turns out that we never call this function, anyway.  So just remove
it.

Fixes #5670.

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 06c1bf73da875f4a6449f38a993530d6fae7817d)
Signed-off-by: Brian Barrett <bbarrett@amazon.com>
Этот коммит содержится в:
Jeff Squyres 2018-09-12 11:43:54 -04:00 коммит произвёл Brian Barrett
родитель 2692840d40
Коммит 547fb3d933
4 изменённых файлов: 0 добавлений и 11 удалений

Просмотреть файл

@ -62,7 +62,6 @@ struct dict {
int (*_insert) __P((void *obj, void *k, void *d, int ow));
int (*_probe) __P((void *obj, void *key, void **dat));
void *(*_search) __P((void *obj, const void *k));
const void *(*_csearch) __P((const void *obj, const void *k));
int (*_remove) __P((void *obj, const void *key, int del));
void (*_walk) __P((void *obj, dict_vis_func func));
unsigned (*_count) __P((const void *obj));
@ -75,7 +74,6 @@ struct dict {
#define dict_insert(dct,k,d,o) (dct)->_insert((dct)->_object, (k), (d), (o))
#define dict_probe(dct,k,d) (dct)->_probe((dct)->_object, (k), (d))
#define dict_search(dct,k) (dct)->_search((dct)->_object, (k))
#define dict_csearch(dct,k) (dct)->_csearch((dct)->_object, (k))
#define dict_remove(dct,k,del) (dct)->_remove((dct)->_object, (k), (del))
#define dict_walk(dct,f) (dct)->_walk((dct)->_object, (f))
#define dict_count(dct) (dct)->_count((dct)->_object)

Просмотреть файл

@ -15,7 +15,6 @@
typedef int (*insert_func) __P((void *, void *k, void *d, int o));
typedef int (*probe_func) __P((void *, void *k, void **d));
typedef void *(*search_func) __P((void *, const void *k));
typedef const void *(*csearch_func) __P((const void *, const void *k));
typedef int (*remove_func) __P((void *, const void *k, int d));
typedef void (*walk_func) __P((void *, dict_vis_func visit));
typedef unsigned (*count_func) __P((const void *));

Просмотреть файл

@ -90,7 +90,6 @@ hb_dict_new(dict_cmp_func key_cmp, dict_del_func key_del,
dct->_insert = (insert_func)hb_tree_insert;
dct->_probe = (probe_func)hb_tree_probe;
dct->_search = (search_func)hb_tree_search;
dct->_csearch = (csearch_func)hb_tree_csearch;
dct->_remove = (remove_func)hb_tree_remove;
dct->_empty = (empty_func)hb_tree_empty;
dct->_walk = (walk_func)hb_tree_walk;
@ -170,12 +169,6 @@ hb_tree_search(hb_tree *tree, const void *key)
return NULL;
}
const void *
hb_tree_csearch(const hb_tree *tree, const void *key)
{
return hb_tree_csearch((hb_tree *)tree, key);
}
int
hb_tree_insert(hb_tree *tree, void *key, void *dat, int overwrite)
{

Просмотреть файл

@ -26,7 +26,6 @@ void hb_tree_destroy __P((hb_tree *tree, int del));
int hb_tree_insert __P((hb_tree *tree, void *key, void *dat, int overwrite));
int hb_tree_probe __P((hb_tree *tree, void *key, void **dat));
void *hb_tree_search __P((hb_tree *tree, const void *key));
const void *hb_tree_csearch __P((const hb_tree *tree, const void *key));
int hb_tree_remove __P((hb_tree *tree, const void *key, int del));
void hb_tree_empty __P((hb_tree *tree, int del));
void hb_tree_walk __P((hb_tree *tree, dict_vis_func visit));