From 17c25e0368e765ec23b7c94e65f5d4e44102f77e Mon Sep 17 00:00:00 2001 From: Stephen Worley Date: Wed, 23 Oct 2019 14:37:20 -0400 Subject: [PATCH] lib: Make nexthop_next* use const for nexthop Make nexthop_next() and nexthop_next_active_resolved() use const for the nexthop argument. They should not be modifying so it makes sense here. Signed-off-by: Stephen Worley --- lib/nexthop.c | 4 ++-- lib/nexthop.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/nexthop.c b/lib/nexthop.c index 0171318827..73c2de0cd8 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -349,7 +349,7 @@ const char *nexthop2str(const struct nexthop *nexthop, char *str, int size) * left branch is 'resolved' and right branch is 'next': * https://en.wikipedia.org/wiki/Tree_traversal#/media/File:Sorted_binary_tree_preorder.svg */ -struct nexthop *nexthop_next(struct nexthop *nexthop) +struct nexthop *nexthop_next(const struct nexthop *nexthop) { if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE)) return nexthop->resolved; @@ -365,7 +365,7 @@ struct nexthop *nexthop_next(struct nexthop *nexthop) } /* Return the next nexthop in the tree that is resolved and active */ -struct nexthop *nexthop_next_active_resolved(struct nexthop *nexthop) +struct nexthop *nexthop_next_active_resolved(const struct nexthop *nexthop) { struct nexthop *next = nexthop_next(nexthop); diff --git a/lib/nexthop.h b/lib/nexthop.h index 480c4cc3dd..fe029f1867 100644 --- a/lib/nexthop.h +++ b/lib/nexthop.h @@ -161,8 +161,9 @@ extern int nexthop_same_firsthop(struct nexthop *next1, struct nexthop *next2); extern const char *nexthop2str(const struct nexthop *nexthop, char *str, int size); -extern struct nexthop *nexthop_next(struct nexthop *nexthop); -extern struct nexthop *nexthop_next_active_resolved(struct nexthop *nexthop); +extern struct nexthop *nexthop_next(const struct nexthop *nexthop); +extern struct nexthop * +nexthop_next_active_resolved(const struct nexthop *nexthop); extern unsigned int nexthop_level(struct nexthop *nexthop); /* Copies to an already allocated nexthop struct */ extern void nexthop_copy(struct nexthop *copy, const struct nexthop *nexthop,