Fix minor mismerges.
No functional change. MFC after: 1 week
This commit is contained in:
parent
4914ee11ae
commit
32d8034f77
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=346760
@ -84,7 +84,7 @@ void range_tree_init(void);
|
|||||||
void range_tree_fini(void);
|
void range_tree_fini(void);
|
||||||
range_tree_t *range_tree_create_impl(range_tree_ops_t *ops, void *arg,
|
range_tree_t *range_tree_create_impl(range_tree_ops_t *ops, void *arg,
|
||||||
int (*avl_compare)(const void*, const void*), uint64_t gap);
|
int (*avl_compare)(const void*, const void*), uint64_t gap);
|
||||||
range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg);
|
range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg);
|
||||||
void range_tree_destroy(range_tree_t *rt);
|
void range_tree_destroy(range_tree_t *rt);
|
||||||
boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size);
|
boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size);
|
||||||
range_seg_t *range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size);
|
range_seg_t *range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size);
|
||||||
@ -116,13 +116,6 @@ void rt_avl_remove(range_tree_t *rt, range_seg_t *rs, void *arg);
|
|||||||
void rt_avl_vacate(range_tree_t *rt, void *arg);
|
void rt_avl_vacate(range_tree_t *rt, void *arg);
|
||||||
extern struct range_tree_ops rt_avl_ops;
|
extern struct range_tree_ops rt_avl_ops;
|
||||||
|
|
||||||
void rt_avl_create(range_tree_t *rt, void *arg);
|
|
||||||
void rt_avl_destroy(range_tree_t *rt, void *arg);
|
|
||||||
void rt_avl_add(range_tree_t *rt, range_seg_t *rs, void *arg);
|
|
||||||
void rt_avl_remove(range_tree_t *rt, range_seg_t *rs, void *arg);
|
|
||||||
void rt_avl_vacate(range_tree_t *rt, void *arg);
|
|
||||||
extern struct range_tree_ops rt_avl_ops;
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user