mirror of
https://github.com/git/git.git
synced 2024-04-27 00:05:12 +02:00
f332121e75
For sanity, we should probably do one of the following:
(a) make C and header files both depend upon everything they need
(b) consistently exclude git-compat-util.h from headers and require it
be the first include in C files
Currently, we have some of the headers following (a) and others
following (b), which makes things messy. In the past I was pushed
towards (b), as per [1] and [2]. Further, during this series I
discovered that this mixture empirically will mean that we end up with C
files that do not directly include git-compat-util.h, and do include
headers that don't include git-compat-util.h, with the result that we
likely have headers included before an indirect inclusion of
git-compat-util.h. Since git-compat-util.h has tricky platform-specific
stuff that is meant to be included before everything else, this state of
affairs is risky and may lead to things breaking in subtle ways (and
only on some platforms) as per [1] and [2].
Since including git-compat-util.h in existing header files makes it
harder for us to catch C files that are missing that include, let's
switch to (b) to make the enforcement of this rule easier. Remove the
inclusion of git-compat-util.h from header files other than the ones
that have been approved as alternate first includes.
[1] https://lore.kernel.org/git/20180811173406.GA9119@sigill.intra.peff.net/
[2] https://lore.kernel.org/git/20180811174301.GA9287@sigill.intra.peff.net/
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
55 lines
1.5 KiB
C
55 lines
1.5 KiB
C
/*
|
|
* crit-bit tree implementation, does no allocations internally
|
|
* For more information on crit-bit trees: https://cr.yp.to/critbit.html
|
|
* Based on Adam Langley's adaptation of Dan Bernstein's public domain code
|
|
* git clone https://github.com/agl/critbit.git
|
|
*
|
|
* This is adapted to store arbitrary data (not just NUL-terminated C strings
|
|
* and allocates no memory internally. The user needs to allocate
|
|
* "struct cb_node" and fill cb_node.k[] with arbitrary match data
|
|
* for memcmp.
|
|
* If "klen" is variable, then it should be embedded into "c_node.k[]"
|
|
* Recursion is bound by the maximum value of "klen" used.
|
|
*/
|
|
#ifndef CBTREE_H
|
|
#define CBTREE_H
|
|
|
|
struct cb_node;
|
|
struct cb_node {
|
|
struct cb_node *child[2];
|
|
/*
|
|
* n.b. uint32_t for `byte' is excessive for OIDs,
|
|
* we may consider shorter variants if nothing else gets stored.
|
|
*/
|
|
uint32_t byte;
|
|
uint8_t otherbits;
|
|
uint8_t k[FLEX_ARRAY]; /* arbitrary data, unaligned */
|
|
};
|
|
|
|
struct cb_tree {
|
|
struct cb_node *root;
|
|
};
|
|
|
|
enum cb_next {
|
|
CB_CONTINUE = 0,
|
|
CB_BREAK = 1
|
|
};
|
|
|
|
#define CBTREE_INIT { 0 }
|
|
|
|
static inline void cb_init(struct cb_tree *t)
|
|
{
|
|
struct cb_tree blank = CBTREE_INIT;
|
|
memcpy(t, &blank, sizeof(*t));
|
|
}
|
|
|
|
struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);
|
|
struct cb_node *cb_insert(struct cb_tree *, struct cb_node *, size_t klen);
|
|
|
|
typedef enum cb_next (*cb_iter)(struct cb_node *, void *arg);
|
|
|
|
void cb_each(struct cb_tree *, const uint8_t *kpfx, size_t klen,
|
|
cb_iter, void *arg);
|
|
|
|
#endif /* CBTREE_H */
|