*: reindentreindent-master-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 218 insertions, 285 deletions

diff --git a/lib/routemap.h b/lib/routemap.h
index f1937ac40..43af8dbcf 100644
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -31,379 +31,312 @@ DECLARE_MTYPE(ROUTE_MAP_RULE)
 DECLARE_MTYPE(ROUTE_MAP_COMPILED)
 
 /* Route map's type. */
-enum route_map_type
-{
-  RMAP_PERMIT,
-  RMAP_DENY,
-  RMAP_ANY
-};
-
-typedef enum 
-{
-  RMAP_MATCH,
-  RMAP_DENYMATCH,
-  RMAP_NOMATCH,
-  RMAP_ERROR,
-  RMAP_OKAY
+enum route_map_type { RMAP_PERMIT, RMAP_DENY, RMAP_ANY };
+
+typedef enum {
+	RMAP_MATCH,
+	RMAP_DENYMATCH,
+	RMAP_NOMATCH,
+	RMAP_ERROR,
+	RMAP_OKAY
 } route_map_result_t;
 
-typedef enum
-{
-  RMAP_RIP,
-  RMAP_RIPNG,
-  RMAP_OSPF,
-  RMAP_OSPF6,
-  RMAP_BGP,
-  RMAP_ZEBRA,
-  RMAP_ISIS,
+typedef enum {
+	RMAP_RIP,
+	RMAP_RIPNG,
+	RMAP_OSPF,
+	RMAP_OSPF6,
+	RMAP_BGP,
+	RMAP_ZEBRA,
+	RMAP_ISIS,
 } route_map_object_t;
 
-typedef enum
-{
-  RMAP_EXIT,
-  RMAP_GOTO,
-  RMAP_NEXT
-} route_map_end_t;
-
-typedef enum
-{
-  RMAP_EVENT_SET_ADDED,
-  RMAP_EVENT_SET_DELETED,
-  RMAP_EVENT_SET_REPLACED,
-  RMAP_EVENT_MATCH_ADDED,
-  RMAP_EVENT_MATCH_DELETED,
-  RMAP_EVENT_MATCH_REPLACED,
-  RMAP_EVENT_INDEX_ADDED,
-  RMAP_EVENT_INDEX_DELETED,
-  RMAP_EVENT_CALL_ADDED,	/* call to another routemap added */
-  RMAP_EVENT_CALL_DELETED,
-  RMAP_EVENT_PLIST_ADDED,
-  RMAP_EVENT_PLIST_DELETED,
-  RMAP_EVENT_CLIST_ADDED,
-  RMAP_EVENT_CLIST_DELETED,
-  RMAP_EVENT_ECLIST_ADDED,
-  RMAP_EVENT_ECLIST_DELETED,
-  RMAP_EVENT_LLIST_ADDED,
-  RMAP_EVENT_LLIST_DELETED,
-  RMAP_EVENT_ASLIST_ADDED,
-  RMAP_EVENT_ASLIST_DELETED,
-  RMAP_EVENT_FILTER_ADDED,
-  RMAP_EVENT_FILTER_DELETED,
+typedef enum { RMAP_EXIT, RMAP_GOTO, RMAP_NEXT } route_map_end_t;
+
+typedef enum {
+	RMAP_EVENT_SET_ADDED,
+	RMAP_EVENT_SET_DELETED,
+	RMAP_EVENT_SET_REPLACED,
+	RMAP_EVENT_MATCH_ADDED,
+	RMAP_EVENT_MATCH_DELETED,
+	RMAP_EVENT_MATCH_REPLACED,
+	RMAP_EVENT_INDEX_ADDED,
+	RMAP_EVENT_INDEX_DELETED,
+	RMAP_EVENT_CALL_ADDED, /* call to another routemap added */
+	RMAP_EVENT_CALL_DELETED,
+	RMAP_EVENT_PLIST_ADDED,
+	RMAP_EVENT_PLIST_DELETED,
+	RMAP_EVENT_CLIST_ADDED,
+	RMAP_EVENT_CLIST_DELETED,
+	RMAP_EVENT_ECLIST_ADDED,
+	RMAP_EVENT_ECLIST_DELETED,
+	RMAP_EVENT_LLIST_ADDED,
+	RMAP_EVENT_LLIST_DELETED,
+	RMAP_EVENT_ASLIST_ADDED,
+	RMAP_EVENT_ASLIST_DELETED,
+	RMAP_EVENT_FILTER_ADDED,
+	RMAP_EVENT_FILTER_DELETED,
 } route_map_event_t;
 
 /* Depth limit in RMAP recursion using RMAP_CALL. */
 #define RMAP_RECURSION_LIMIT      10
 
 /* Route map rule structure for matching and setting. */
-struct route_map_rule_cmd
-{
-  /* Route map rule name (e.g. as-path, metric) */
-  const char *str;
+struct route_map_rule_cmd {
+	/* Route map rule name (e.g. as-path, metric) */
+	const char *str;
 
-  /* Function for value set or match. */
-  route_map_result_t (*func_apply)(void *, struct prefix *, 
-				   route_map_object_t, void *);
+	/* Function for value set or match. */
+	route_map_result_t (*func_apply)(void *, struct prefix *,
+					 route_map_object_t, void *);
 
-  /* Compile argument and return result as void *. */
-  void *(*func_compile)(const char *);
+	/* Compile argument and return result as void *. */
+	void *(*func_compile)(const char *);
 
-  /* Free allocated value by func_compile (). */
-  void (*func_free)(void *);
+	/* Free allocated value by func_compile (). */
+	void (*func_free)(void *);
 };
 
 /* Route map apply error. */
-enum
-{
-  /* Route map rule is missing. */
-  RMAP_RULE_MISSING = 1,
+enum {
+	/* Route map rule is missing. */
+	RMAP_RULE_MISSING = 1,
 
-  /* Route map rule can't compile */
-  RMAP_COMPILE_ERROR
+	/* Route map rule can't compile */
+	RMAP_COMPILE_ERROR
 };
 
 /* Route map rule list. */
-struct route_map_rule_list
-{
-  struct route_map_rule *head;
-  struct route_map_rule *tail;
+struct route_map_rule_list {
+	struct route_map_rule *head;
+	struct route_map_rule *tail;
 };
 
 /* Route map index structure. */
-struct route_map_index
-{
-  struct route_map *map;
-  char *description;
+struct route_map_index {
+	struct route_map *map;
+	char *description;
 
-  /* Preference of this route map rule. */
-  int pref;
+	/* Preference of this route map rule. */
+	int pref;
 
-  /* Route map type permit or deny. */
-  enum route_map_type type;			
+	/* Route map type permit or deny. */
+	enum route_map_type type;
 
-  /* Do we follow old rules, or hop forward? */
-  route_map_end_t exitpolicy;
+	/* Do we follow old rules, or hop forward? */
+	route_map_end_t exitpolicy;
 
-  /* If we're using "GOTO", to where do we go? */
-  int nextpref;
+	/* If we're using "GOTO", to where do we go? */
+	int nextpref;
 
-  /* If we're using "CALL", to which route-map do ew go? */
-  char *nextrm;
+	/* If we're using "CALL", to which route-map do ew go? */
+	char *nextrm;
 
-  /* Matching rule list. */
-  struct route_map_rule_list match_list;
-  struct route_map_rule_list set_list;
+	/* Matching rule list. */
+	struct route_map_rule_list match_list;
+	struct route_map_rule_list set_list;
 
-  /* Make linked list. */
-  struct route_map_index *next;
-  struct route_map_index *prev;
+	/* Make linked list. */
+	struct route_map_index *next;
+	struct route_map_index *prev;
 
-  QOBJ_FIELDS
+	QOBJ_FIELDS
 };
 DECLARE_QOBJ_TYPE(route_map_index)
 
 /* Route map list structure. */
-struct route_map
-{
-  /* Name of route map. */
-  char *name;
+struct route_map {
+	/* Name of route map. */
+	char *name;
 
-  /* Route map's rule. */
-  struct route_map_index *head;
-  struct route_map_index *tail;
+	/* Route map's rule. */
+	struct route_map_index *head;
+	struct route_map_index *tail;
 
-  /* Make linked list. */
-  struct route_map *next;
-  struct route_map *prev;
+	/* Make linked list. */
+	struct route_map *next;
+	struct route_map *prev;
 
-  /* Maintain update info */
-  int to_be_processed;	 /* True if modification isn't acted on yet */
-  int deleted;		 /* If 1, then this node will be deleted */
+	/* Maintain update info */
+	int to_be_processed; /* True if modification isn't acted on yet */
+	int deleted;	 /* If 1, then this node will be deleted */
 
-  QOBJ_FIELDS
+	QOBJ_FIELDS
 };
 DECLARE_QOBJ_TYPE(route_map)
 
 /* Prototypes. */
-extern void route_map_init (void);
-extern void route_map_finish (void);
+extern void route_map_init(void);
+extern void route_map_finish(void);
 
 /* Add match statement to route map. */
-extern int route_map_add_match (struct route_map_index *index,
-		                const char *match_name,
-		                const char *match_arg);
+extern int route_map_add_match(struct route_map_index *index,
+			       const char *match_name, const char *match_arg);
 
 /* Delete specified route match rule. */
-extern int route_map_delete_match (struct route_map_index *index,
-			           const char *match_name,
-			           const char *match_arg);
+extern int route_map_delete_match(struct route_map_index *index,
+				  const char *match_name,
+				  const char *match_arg);
 
-extern const char *route_map_get_match_arg (struct route_map_index *index,
-					    const char *match_name);
+extern const char *route_map_get_match_arg(struct route_map_index *index,
+					   const char *match_name);
 
 /* Add route-map set statement to the route map. */
-extern int route_map_add_set (struct route_map_index *index, 
-		              const char *set_name,
-		              const char *set_arg);
+extern int route_map_add_set(struct route_map_index *index,
+			     const char *set_name, const char *set_arg);
 
 /* Delete route map set rule. */
-extern int route_map_delete_set (struct route_map_index *index,
-                                 const char *set_name,
-                                 const char *set_arg);
+extern int route_map_delete_set(struct route_map_index *index,
+				const char *set_name, const char *set_arg);
 
 /* Install rule command to the match list. */
-extern void route_map_install_match (struct route_map_rule_cmd *cmd);
+extern void route_map_install_match(struct route_map_rule_cmd *cmd);
 
 /* Install rule command to the set list. */
-extern void route_map_install_set (struct route_map_rule_cmd *cmd);
+extern void route_map_install_set(struct route_map_rule_cmd *cmd);
 
 /* Lookup route map by name. */
-extern struct route_map * route_map_lookup_by_name (const char *name);
+extern struct route_map *route_map_lookup_by_name(const char *name);
 
 /* Apply route map to the object. */
-extern route_map_result_t route_map_apply (struct route_map *map,
-                                           struct prefix *,
-                                           route_map_object_t object_type,
-                                           void *object);
-
-extern void route_map_add_hook (void (*func) (const char *));
-extern void route_map_delete_hook (void (*func) (const char *));
-extern void route_map_event_hook (void (*func) (route_map_event_t,
-						const char *));
-extern int route_map_mark_updated (const char *name, int deleted);
-extern int route_map_clear_updated (struct route_map *rmap);
-extern void route_map_walk_update_list (int (*update_fn) (char *name));
-extern void route_map_upd8_dependency (route_map_event_t type, const char *arg,
-				       const char *rmap_name);
-extern void route_map_notify_dependencies (const char *affected_name,
-					   route_map_event_t event);
-
-extern int generic_match_add (struct vty *vty,
-                              struct route_map_index *index,
-                              const char *command,
-                              const char *arg,
-                              route_map_event_t type);
-
-extern int generic_match_delete (struct vty *vty,
-                                 struct route_map_index *index,
-                                 const char *command,
-                                 const char *arg,
-                                 route_map_event_t type);
-extern int generic_set_add (struct vty *vty, struct route_map_index *index,
-                            const char *command, const char *arg);
-extern int generic_set_delete (struct vty *vty, struct route_map_index *index,
-                               const char *command, const char *arg);
+extern route_map_result_t route_map_apply(struct route_map *map,
+					  struct prefix *,
+					  route_map_object_t object_type,
+					  void *object);
+
+extern void route_map_add_hook(void (*func)(const char *));
+extern void route_map_delete_hook(void (*func)(const char *));
+extern void route_map_event_hook(void (*func)(route_map_event_t, const char *));
+extern int route_map_mark_updated(const char *name, int deleted);
+extern int route_map_clear_updated(struct route_map *rmap);
+extern void route_map_walk_update_list(int (*update_fn)(char *name));
+extern void route_map_upd8_dependency(route_map_event_t type, const char *arg,
+				      const char *rmap_name);
+extern void route_map_notify_dependencies(const char *affected_name,
+					  route_map_event_t event);
+
+extern int generic_match_add(struct vty *vty, struct route_map_index *index,
+			     const char *command, const char *arg,
+			     route_map_event_t type);
+
+extern int generic_match_delete(struct vty *vty, struct route_map_index *index,
+				const char *command, const char *arg,
+				route_map_event_t type);
+extern int generic_set_add(struct vty *vty, struct route_map_index *index,
+			   const char *command, const char *arg);
+extern int generic_set_delete(struct vty *vty, struct route_map_index *index,
+			      const char *command, const char *arg);
 
 
 /* match interface */
-extern void route_map_match_interface_hook (int (*func) (struct vty *vty,
-                                                         struct route_map_index *index,
-                                                         const char *command,
-                                                         const char *arg,
-                                                         route_map_event_t type));
+extern void route_map_match_interface_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match interface */
-extern void route_map_no_match_interface_hook (int (*func) (struct vty *vty,
-                                                            struct route_map_index *index,
-                                                            const char *command,
-                                                            const char *arg,
-                                                            route_map_event_t type));
+extern void route_map_no_match_interface_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ip address */
-extern void route_map_match_ip_address_hook (int (*func) (struct vty *vty,
-                                                          struct route_map_index *index,
-                                                          const char *command,
-                                                          const char *arg,
-                                                          route_map_event_t type));
+extern void route_map_match_ip_address_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ip address */
-extern void route_map_no_match_ip_address_hook (int (*func) (struct vty *vty,
-                                                             struct route_map_index *index,
-                                                             const char *command,
-                                                             const char *arg,
-                                                             route_map_event_t type));
+extern void route_map_no_match_ip_address_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ip address prefix list */
-extern void route_map_match_ip_address_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                      struct route_map_index *index,
-                                                                      const char *command,
-                                                                      const char *arg,
-                                                                      route_map_event_t type));
+extern void route_map_match_ip_address_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ip address prefix list */
-extern void route_map_no_match_ip_address_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                         struct route_map_index *index,
-                                                                         const char *command,
-                                                                         const char *arg,
-                                                                         route_map_event_t type));
+extern void route_map_no_match_ip_address_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ip next hop */
-extern void route_map_match_ip_next_hop_hook (int (*func) (struct vty *vty,
-                                                           struct route_map_index *index,
-                                                           const char *command,
-                                                           const char *arg,
-                                                           route_map_event_t type));
+extern void route_map_match_ip_next_hop_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ip next hop */
-extern void route_map_no_match_ip_next_hop_hook (int (*func) (struct vty *vty,
-                                                              struct route_map_index *index,
-                                                              const char *command,
-                                                              const char *arg,
-                                                              route_map_event_t type));
+extern void route_map_no_match_ip_next_hop_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ip next hop prefix list */
-extern void route_map_match_ip_next_hop_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                       struct route_map_index *index,
-                                                                       const char *command,
-                                                                       const char *arg,
-                                                                       route_map_event_t type));
+extern void route_map_match_ip_next_hop_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ip next hop prefix list */
-extern void route_map_no_match_ip_next_hop_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                          struct route_map_index *index,
-                                                                          const char *command,
-                                                                          const char *arg,
-                                                                          route_map_event_t type));
+extern void route_map_no_match_ip_next_hop_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ipv6 address */
-extern void route_map_match_ipv6_address_hook (int (*func) (struct vty *vty,
-                                                            struct route_map_index *index,
-                                                            const char *command,
-                                                            const char *arg,
-                                                            route_map_event_t type));
+extern void route_map_match_ipv6_address_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ipv6 address */
-extern void route_map_no_match_ipv6_address_hook (int (*func) (struct vty *vty,
-                                                               struct route_map_index *index,
-                                                               const char *command,
-                                                               const char *arg,
-                                                               route_map_event_t type));
+extern void route_map_no_match_ipv6_address_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match ipv6 address prefix list */
-extern void route_map_match_ipv6_address_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                        struct route_map_index *index,
-                                                                        const char *command,
-                                                                        const char *arg,
-                                                                        route_map_event_t type));
+extern void route_map_match_ipv6_address_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match ipv6 address prefix list */
-extern void route_map_no_match_ipv6_address_prefix_list_hook (int (*func) (struct vty *vty,
-                                                                           struct route_map_index *index,
-                                                                           const char *command,
-                                                                           const char *arg,
-                                                                           route_map_event_t type));
+extern void route_map_no_match_ipv6_address_prefix_list_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match metric */
-extern void route_map_match_metric_hook (int (*func) (struct vty *vty,
-                                                      struct route_map_index *index,
-                                                      const char *command,
-                                                      const char *arg,
-                                                      route_map_event_t type));
+extern void route_map_match_metric_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match metric */
-extern void route_map_no_match_metric_hook (int (*func) (struct vty *vty,
-                                                         struct route_map_index *index,
-                                                         const char *command,
-                                                         const char *arg,
-                                                         route_map_event_t type));
+extern void route_map_no_match_metric_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* match tag */
-extern void route_map_match_tag_hook (int (*func) (struct vty *vty,
-                                                   struct route_map_index *index,
-                                                   const char *command,
-                                                   const char *arg,
-                                                   route_map_event_t type));
+extern void route_map_match_tag_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* no match tag */
-extern void route_map_no_match_tag_hook (int (*func) (struct vty *vty,
-                                                      struct route_map_index *index,
-                                                      const char *command,
-                                                      const char *arg,
-                                                      route_map_event_t type));
+extern void route_map_no_match_tag_hook(int (*func)(
+	struct vty *vty, struct route_map_index *index, const char *command,
+	const char *arg, route_map_event_t type));
 /* set ip nexthop */
-extern void route_map_set_ip_nexthop_hook (int (*func) (struct vty *vty,
-                                                        struct route_map_index *index,
-                                                        const char *command,
-                                                        const char *arg));
+extern void route_map_set_ip_nexthop_hook(
+	int (*func)(struct vty *vty, struct route_map_index *index,
+		    const char *command, const char *arg));
 /* no set ip nexthop */
-extern void route_map_no_set_ip_nexthop_hook (int (*func) (struct vty *vty,
-                                                           struct route_map_index *index,
-                                                           const char *command,
-                                                           const char *arg));
+extern void route_map_no_set_ip_nexthop_hook(
+	int (*func)(struct vty *vty, struct route_map_index *index,
+		    const char *command, const char *arg));
 /* set ipv6 nexthop local */
-extern void route_map_set_ipv6_nexthop_local_hook (int (*func) (struct vty *vty,
-                                                                struct route_map_index *index,
-                                                                const char *command,
-                                                                const char *arg));
+extern void route_map_set_ipv6_nexthop_local_hook(
+	int (*func)(struct vty *vty, struct route_map_index *index,
+		    const char *command, const char *arg));
 /* no set ipv6 nexthop local */
-extern void route_map_no_set_ipv6_nexthop_local_hook (int (*func) (struct vty *vty,
-                                                                   struct route_map_index *index,
-                                                                   const char *command,
-                                                                   const char *arg));
+extern void route_map_no_set_ipv6_nexthop_local_hook(
+	int (*func)(struct vty *vty, struct route_map_index *index,
+		    const char *command, const char *arg));
 /* set metric */
-extern void route_map_set_metric_hook (int (*func) (struct vty *vty,
-                                                    struct route_map_index *index,
-                                                    const char *command,
-                                                    const char *arg));
+extern void route_map_set_metric_hook(int (*func)(struct vty *vty,
+						  struct route_map_index *index,
+						  const char *command,
+						  const char *arg));
 /* no set metric */
-extern void route_map_no_set_metric_hook (int (*func) (struct vty *vty,
-                                                       struct route_map_index *index,
-                                                       const char *command,
-                                                       const char *arg));
+extern void route_map_no_set_metric_hook(
+	int (*func)(struct vty *vty, struct route_map_index *index,
+		    const char *command, const char *arg));
 /* set tag */
-extern void route_map_set_tag_hook (int (*func) (struct vty *vty,
-                                                 struct route_map_index *index,
-                                                 const char *command,
-                                                 const char *arg));
+extern void route_map_set_tag_hook(int (*func)(struct vty *vty,
+					       struct route_map_index *index,
+					       const char *command,
+					       const char *arg));
 /* no set tag */
-extern void route_map_no_set_tag_hook (int (*func) (struct vty *vty,
-                                                    struct route_map_index *index,
-                                                    const char *command,
-                                                    const char *arg));
+extern void route_map_no_set_tag_hook(int (*func)(struct vty *vty,
+						  struct route_map_index *index,
+						  const char *command,
+						  const char *arg));
 
-extern void *route_map_rule_tag_compile (const char *arg);
-extern void route_map_rule_tag_free (void *rule);
+extern void *route_map_rule_tag_compile(const char *arg);
+extern void route_map_rule_tag_free(void *rule);
 
 #endif /* _ZEBRA_ROUTEMAP_H */