diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-05-15 07:49:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 07:49:10 -0400 |
| commit | 5704e7109dc562d7d85c9b2a80ad8759cfba56ed (patch) | |
| tree | 47d898e67f0e1dda2c51915299fbb13231d07ba5 /zebra/zebra_rib.c | |
| parent | 809241f44214f49e34b99a00eb2f588ee019d2cb (diff) | |
| parent | cd7108ba928588a14250ef3bc8a8a44eb0f2c81d (diff) | |
Merge pull request #6401 from volta-networks/fix_c++_keywords
zebra: avoid using c++ keywords in headers
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index ae730499ab..d491982d62 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -211,28 +211,29 @@ static void route_entry_attach_ref(struct route_entry *re, zebra_nhg_increment_ref(new); } -int route_entry_update_nhe(struct route_entry *re, struct nhg_hash_entry *new) +int route_entry_update_nhe(struct route_entry *re, + struct nhg_hash_entry *new_nhghe) { struct nhg_hash_entry *old; int ret = 0; - if (new == NULL) { + if (new_nhghe == NULL) { if (re->nhe) zebra_nhg_decrement_ref(re->nhe); re->nhe = NULL; goto done; } - if ((re->nhe_id != 0) && (re->nhe_id != new->id)) { + if ((re->nhe_id != 0) && (re->nhe_id != new_nhghe->id)) { old = re->nhe; - route_entry_attach_ref(re, new); + route_entry_attach_ref(re, new_nhghe); if (old) zebra_nhg_decrement_ref(old); } else if (!re->nhe) /* This is the first time it's being attached */ - route_entry_attach_ref(re, new); + route_entry_attach_ref(re, new_nhghe); done: return ret; |