Update vtree.h from FreeBSD's sys/sys/tree.h (their: c2ddf2edb4aa4)

bin/varnishd/cache/cache_vrt_priv.c

@@ -55,6 +55,7 @@ static inline int vrt_priv_dyncmp(const struct vrt_priv *,
 
 VRBT_GENERATE_INSERT_COLOR(vrt_privs, vrt_priv, entry, static)
 VRBT_GENERATE_FIND(vrt_privs, vrt_priv, entry, vrt_priv_dyncmp, static)
+VRBT_GENERATE_INSERT_FINISH(vrt_privs, vrt_priv, entry, static)
 VRBT_GENERATE_INSERT(vrt_privs, vrt_priv, entry, vrt_priv_dyncmp, static)
 VRBT_GENERATE_MINMAX(vrt_privs, vrt_priv, entry, static)
 VRBT_GENERATE_NEXT(vrt_privs, vrt_priv, entry, static)

bin/varnishtop/varnishtop.c

@@ -111,6 +111,7 @@ cmp_order(const struct top *a, const struct top *b)
 }
 
 VRBT_GENERATE_INSERT_COLOR(t_order, top, e_order, static)
+VRBT_GENERATE_INSERT_FINISH(t_order, top, e_order, static)
 VRBT_GENERATE_INSERT(t_order, top, e_order, cmp_order, static)
 VRBT_GENERATE_REMOVE_COLOR(t_order, top, e_order, static)
 VRBT_GENERATE_MINMAX(t_order, top, e_order, static)
@@ -119,6 +120,7 @@ VRBT_GENERATE_REMOVE(t_order, top, e_order, static)
 
 VRBT_GENERATE_INSERT_COLOR(t_key, top, e_key, static)
 VRBT_GENERATE_REMOVE_COLOR(t_key, top, e_key, static)
+VRBT_GENERATE_INSERT_FINISH(t_key, top, e_key, static)
 VRBT_GENERATE_INSERT(t_key, top, e_key, cmp_key, static)
 VRBT_GENERATE_REMOVE(t_key, top, e_key, static)
 VRBT_GENERATE_FIND(t_key, top, e_key, cmp_key, static)

flint.lnt

@@ -216,6 +216,12 @@
 -emacro(527, VRBT_*)		// unreachable code
 -emacro(740, VRBT_*)		// unusual pointer cast
 -emacro(438, VRBT_*)		// last value assigned not used
+-emacro(613, VRBT_*)	// Possible use of null pointer 'child' in left argument to
+-emacro(838, VRBT_*)	// Previously assigned value to variable 'child' has not been used
+-emacro(50, VRBT_GENERATE_*) // Attempted to take the address of a non-lvalue
+-emacro(506, VRBT_GENERATE_*) // Constant value Boolean
+-emacro(845, VRBT_GENERATE_*) // The left argument to operator '&&' is certain to be 0
+-emacro(774, VRBT_GENERATE_*) // Boolean within 'if' always evaluates to False
 -esym(534, *_VRBT_REMOVE)	// ignore retval
 -esym(534, *_VRBT_INSERT)	// ignore retval
 

lib/libvarnishapi/vsl_dispatch.c

@@ -232,6 +232,7 @@ vtx_keycmp(const struct vtx_key *a, const struct vtx_key *b)
 VRBT_GENERATE_REMOVE_COLOR(vtx_tree, vtx_key, entry, static)
 VRBT_GENERATE_REMOVE(vtx_tree, vtx_key, entry, static)
 VRBT_GENERATE_INSERT_COLOR(vtx_tree, vtx_key, entry, static)
+VRBT_GENERATE_INSERT_FINISH(vtx_tree, vtx_key, entry, static)
 VRBT_GENERATE_INSERT(vtx_tree, vtx_key, entry, vtx_keycmp, static)
 VRBT_GENERATE_FIND(vtx_tree, vtx_key, entry, vtx_keycmp, static)
 

lib/libvcc/vcc_acl.c

@@ -150,6 +150,7 @@ vcl_acl_disjoint(const struct acl_e *ae1, const struct acl_e *ae2)
 }
 
 VRBT_GENERATE_INSERT_COLOR(acl_tree, acl_e, branch, static)
+VRBT_GENERATE_INSERT_FINISH(acl_tree, acl_e, branch, static)
 VRBT_GENERATE_INSERT(acl_tree, acl_e, branch, vcl_acl_cmp, static)
 VRBT_GENERATE_MINMAX(acl_tree, acl_e, branch, static)
 VRBT_GENERATE_NEXT(acl_tree, acl_e, branch, static)