Simplify prefix_cmp.

9f6b430b · Juliusz Chroboczek · 6d99bd57 · 9f6b430b
Commit 9f6b430b authored Jun 04, 2015 by Juliusz Chroboczek
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 13 deletions

util.c util.c +10 -13

No files found.
--- a/util.c
+++ b/util.c
@@ -494,25 +494,22 @@ enum prefix_status
 prefix_cmp(const unsigned char *p1, unsigned char plen1,
           const unsigned char *p2, unsigned char plen2)
 {
-    int min = MIN(plen1, plen2);
+    int plen = MIN(plen1, plen2);
-    unsigned char mask = 0xFF;
-    int i = 0;
-    while(i < min / 8) {
+    if(memcmp(p1, p2, plen / 8) != 0)
-        if(p1[i] != p2[i])
        return PST_DISJOINT;
-        i++;
-    }
+    if(plen % 8 != 0) {
-    min -= i * 8;
+        int i = plen / 8 + 1;
-    if(min != 0) {
+        unsigned char mask = (0xFF << (plen % 8)) & 0xFF;
-        mask <<= 8 - min;
        if((p1[i] & mask) != (p2[i] & mask))
            return PST_DISJOINT;
    }
    if(plen1 < plen2)
        return PST_LESS_SPECIFIC;
-    if(plen1 > plen2)
+    else if(plen1 > plen2)
        return PST_MORE_SPECIFIC;
+    else
        return PST_EQUALS;
 }