summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorStephen Worley <sworley@cumulusnetworks.com>2019-10-23 20:37:20 +0200
committerStephen Worley <sworley@cumulusnetworks.com>2019-10-25 17:13:44 +0200
commit17c25e0368e765ec23b7c94e65f5d4e44102f77e (patch)
tree36128bfd33ab2aa3697cfe2b3672797df4461ca3 /lib
parentzebra: Check depends for validity, not dependents (diff)
downloadfrr-17c25e0368e765ec23b7c94e65f5d4e44102f77e.tar.xz
frr-17c25e0368e765ec23b7c94e65f5d4e44102f77e.zip
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 <sworley@cumulusnetworks.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/nexthop.c4
-rw-r--r--lib/nexthop.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/nexthop.c b/lib/nexthop.c
index 017131882..73c2de0cd 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 480c4cc3d..fe029f186 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,