diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-03-31 21:17:00 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-03-31 21:17:00 +0200 |
| commit | c60cdd8c3926a1b3d9156327e8aae64986084ff4 (patch) | |
| tree | a6ee8b63c24478687d5ac03149a28f2a8044bcab | |
| parent | b1a597e0c3821c791a41278454e74261cf1b95fb (diff) | |
Cleanup changes
| -rw-r--r-- | filter/trie.c | 5 | ||||
| -rw-r--r-- | lib/bitops.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/filter/trie.c b/filter/trie.c index 7f9f5f88..ffb9b99f 100644 --- a/filter/trie.c +++ b/filter/trie.c @@ -49,11 +49,6 @@ * final node (if it is not in the trie) and we came to node that * is either extension of our prefix, or completely out of path * In the first case, we also have to check M2. - - * There also might be - * a problem that interval of acceptance (on path from root to the - * final node) might be completely missing (for example if we have - * prefix patterns 192.168.128.0/24{8,10} and 192.168.1.0/24 * * Second, we really need not to maintain two separate bitmasks. * Checks for mask M1 are always larger than &applen and we need diff --git a/lib/bitops.c b/lib/bitops.c index 88cef78a..b63274b8 100644 --- a/lib/bitops.c +++ b/lib/bitops.c @@ -52,12 +52,13 @@ u32_masklen(u32 x) * * This function computes a integral part of binary logarithm of given * integer @v and returns it. The computed value is also an index of the - * first non-zero bit position. + * most significant non-zero bit position. */ u32 u32_log2(u32 v) { + /* The code from http://www-graphics.stanford.edu/~seander/bithacks.html */ u32 r, shift; r = (v > 0xFFFF) << 4; v >>= r; shift = (v > 0xFF ) << 3; v >>= shift; r |= shift; @@ -66,3 +67,4 @@ u32_log2(u32 v) r |= (v >> 1); return r; } + |