Skip to content

Commit b44822b

Browse files
committed
lib, tests: Remove in6addr_cmp function from the system
This function should just be memcmp. Signed-off-by: Donald Sharp <[email protected]>
1 parent d8f0b96 commit b44822b

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

lib/sockunion.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -588,23 +588,6 @@ static void __attribute__((unused)) sockunion_print(const union sockunion *su)
588588
}
589589
}
590590

591-
int in6addr_cmp(const struct in6_addr *addr1, const struct in6_addr *addr2)
592-
{
593-
unsigned int i;
594-
const uint8_t *p1, *p2;
595-
596-
p1 = (const uint8_t *)addr1;
597-
p2 = (const uint8_t *)addr2;
598-
599-
for (i = 0; i < sizeof(struct in6_addr); i++) {
600-
if (p1[i] > p2[i])
601-
return 1;
602-
else if (p1[i] < p2[i])
603-
return -1;
604-
}
605-
return 0;
606-
}
607-
608591
int sockunion_cmp(const union sockunion *su1, const union sockunion *su2)
609592
{
610593
if (su1->sa.sa_family > su2->sa.sa_family)

lib/sockunion.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ enum connect_result { connect_error, connect_success, connect_in_progress };
9393
/* Prototypes. */
9494
extern int str2sockunion(const char *, union sockunion *);
9595
extern const char *sockunion2str(const union sockunion *, char *, size_t);
96-
int in6addr_cmp(const struct in6_addr *addr1, const struct in6_addr *addr2);
9796
extern int sockunion_cmp(const union sockunion *, const union sockunion *);
9897
extern int sockunion_same(const union sockunion *, const union sockunion *);
9998
extern unsigned int sockunion_hash(const union sockunion *);

tests/lib/test_frrlua.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void test_encode_decode(void)
9090

9191
lua_pushin6addr(L, &in6addr_a);
9292
lua_decode_in6addr(L, -1, &in6addr_a);
93-
assert(in6addr_cmp(&in6addr_a, &in6addr_b) == 0);
93+
assert(memcmp(&in6addr_a, &in6addr_b, sizeof(struct in6_addr)) == 0);
9494
assert(lua_gettop(L) == 0);
9595

9696
union sockunion su_a, su_b;

0 commit comments

Comments
 (0)