summaryrefslogtreecommitdiffstats
path: root/zebra/zebra_gr.c
diff options
context:
space:
mode:
authorEmanuele Di Pascale <emanuele@voltanet.io>2020-05-14 15:57:23 +0200
committerEmanuele Di Pascale <emanuele@voltanet.io>2020-05-14 16:42:47 +0200
commitcd7108ba928588a14250ef3bc8a8a44eb0f2c81d (patch)
tree92d7eb87dc9f8dababffabb6dc70cab7bd7ed78f /zebra/zebra_gr.c
parentMerge pull request #6227 from pguibert6WIND/show_nexthop_group_permit_netns (diff)
downloadfrr-cd7108ba928588a14250ef3bc8a8a44eb0f2c81d.tar.xz
frr-cd7108ba928588a14250ef3bc8a8a44eb0f2c81d.zip
zebra: avoid using c++ keywords in headers
to make sure that c++ code can include them, avoid using reserved keywords like 'delete' or 'new'. Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
Diffstat (limited to 'zebra/zebra_gr.c')
-rw-r--r--zebra/zebra_gr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c
index 19a280c0c..a4f32dbf3 100644
--- a/zebra/zebra_gr.c
+++ b/zebra/zebra_gr.c
@@ -133,7 +133,7 @@ static void zebra_gr_client_info_delte(struct zserv *client,
zebra_route_string(client->proto));
/* Delete all the stale routes. */
- info->delete = true;
+ info->do_delete = true;
zebra_gr_delete_stale_routes(info);
XFREE(MTYPE_TMP, info);
@@ -456,7 +456,7 @@ static int32_t zebra_gr_route_stale_delete_timer_expiry(struct thread *thread)
/* Set the flag to indicate all stale route deletion */
if (thread->u.val == 1)
- info->delete = true;
+ info->do_delete = true;
cnt = zebra_gr_delete_stale_routes(info);
@@ -581,7 +581,7 @@ static int32_t zebra_gr_delete_stale_route(struct client_gr_info *info,
* Store the current prefix and afi
*/
if ((n >= ZEBRA_MAX_STALE_ROUTE_COUNT)
- && (info->delete == false)) {
+ && (info->do_delete == false)) {
info->current_afi = afi;
info->current_prefix = XCALLOC(
MTYPE_TMP,