diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-22 14:52:33 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-22 14:52:33 +0200 |
| commit | 9d303b37d73b8fe2bef310d8d9ca1acad23c2501 (patch) | |
| tree | bbe78c595bd8f42b76322df2a37cf81f60c08a6a /ripngd | |
| parent | *: add git-reindent-branch.py (diff) | |
| download | frr-9d303b37d73b8fe2bef310d8d9ca1acad23c2501.tar.xz frr-9d303b37d73b8fe2bef310d8d9ca1acad23c2501.zip | |
Revert "*: reindent pt. 2"
This reverts commit c14777c6bfd0a446c85243d3a9835054a259c276.
clang 5 is not widely available enough for people to indent with. This
is particularly problematic when rebasing/adjusting branches.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ripngd')
| -rw-r--r-- | ripngd/ripng_routemap.c | 8 | ||||
| -rw-r--r-- | ripngd/ripng_zebra.c | 3 | ||||
| -rw-r--r-- | ripngd/ripngd.c | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c index 0696d61ac..3080801fb 100644 --- a/ripngd/ripng_routemap.c +++ b/ripngd/ripng_routemap.c @@ -150,9 +150,7 @@ static route_map_result_t route_match_tag(void *rule, struct prefix *prefix, } static struct route_map_rule_cmd route_match_tag_cmd = { - "tag", - route_match_tag, - route_map_rule_tag_compile, + "tag", route_match_tag, route_map_rule_tag_compile, route_map_rule_tag_free, }; @@ -242,9 +240,7 @@ static void route_set_metric_free(void *rule) } static struct route_map_rule_cmd route_set_metric_cmd = { - "metric", - route_set_metric, - route_set_metric_compile, + "metric", route_set_metric, route_set_metric_compile, route_set_metric_free, }; diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index 709a285ab..386bee43b 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -507,8 +507,7 @@ static int zebra_config_write(struct vty *vty) /* Zebra node structure. */ static struct cmd_node zebra_node = { - ZEBRA_NODE, - "%s(config-router)# ", + ZEBRA_NODE, "%s(config-router)# ", }; static void ripng_zebra_connected(struct zclient *zclient) diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 874c42e7e..2883698f4 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -742,8 +742,9 @@ static void ripng_route_process(struct rte *rte, struct sockaddr_in6 *from, } } rte->tag = htons(newinfo.tag_out); /* XXX */ - rte->metric = newinfo.metric_out; /* XXX: the routemap uses the - metric_out field */ + rte->metric = + newinfo.metric_out; /* XXX: the routemap uses the + metric_out field */ } /* Once the entry has been validated, update the metric by @@ -2717,9 +2718,7 @@ static int ripng_config_write(struct vty *vty) /* RIPng node structure. */ static struct cmd_node cmd_ripng_node = { - RIPNG_NODE, - "%s(config-router)# ", - 1, + RIPNG_NODE, "%s(config-router)# ", 1, }; static void ripng_distribute_update(struct distribute *dist) |