Merge pull request #2099 from qlyoung/fix-cpu-thread-hist-race

[mirror_frr.git] / lib / routemap.c

diff --git a/lib/routemap.c b/lib/routemap.c
index 175e0999942a12c105c8019f1762aa97e9af8eaf..ea61043a8d2adf78d8d4335e1a7981fd61c2a726 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -423,8 +423,7 @@ int generic_match_add(struct vty *vty, struct route_map_index *index,
                }
                break;
        case RMAP_RULE_MISSING:
-               vty_out(vty, "%% [%s] Can't find rule.\n",
-                       frr_protonameinst);
+               vty_out(vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
                return CMD_WARNING_CONFIG_FAILED;
                break;
        case RMAP_COMPILE_ERROR:
@@ -464,8 +463,7 @@ int generic_match_delete(struct vty *vty, struct route_map_index *index,
        ret = route_map_delete_match(index, command, dep_name);
        switch (ret) {
        case RMAP_RULE_MISSING:
-               vty_out(vty, "%% [%s] Can't find rule.\n",
-                       frr_protonameinst);
+               vty_out(vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
                retval = CMD_WARNING_CONFIG_FAILED;
                break;
        case RMAP_COMPILE_ERROR:
@@ -496,8 +494,7 @@ int generic_set_add(struct vty *vty, struct route_map_index *index,
        ret = route_map_add_set(index, command, arg);
        switch (ret) {
        case RMAP_RULE_MISSING:
-               vty_out(vty, "%% [%s] Can't find rule.\n",
-                       frr_protonameinst);
+               vty_out(vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
                return CMD_WARNING_CONFIG_FAILED;
                break;
        case RMAP_COMPILE_ERROR:
@@ -521,8 +518,7 @@ int generic_set_delete(struct vty *vty, struct route_map_index *index,
        ret = route_map_delete_set(index, command, arg);
        switch (ret) {
        case RMAP_RULE_MISSING:
-               vty_out(vty, "%% [%s] Can't find rule.\n",
-                       frr_protonameinst);
+               vty_out(vty, "%% [%s] Can't find rule.\n", frr_protonameinst);
                return CMD_WARNING_CONFIG_FAILED;
                break;
        case RMAP_COMPILE_ERROR:
@@ -1581,10 +1577,9 @@ static void *route_map_dep_hash_alloc(void *p)
 
        dep_entry = XCALLOC(MTYPE_ROUTE_MAP_DEP, sizeof(struct route_map_dep));
        dep_entry->dep_name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, dep_name);
-       dep_entry->dep_rmap_hash = hash_create_size(8,
-                                                   route_map_dep_hash_make_key,
-                                                   route_map_rmap_hash_cmp,
-                                                   "Route Map Dep Hash");
+       dep_entry->dep_rmap_hash =
+               hash_create_size(8, route_map_dep_hash_make_key,
+                                route_map_rmap_hash_cmp, "Route Map Dep Hash");
        dep_entry->this_hash = NULL;
 
        return ((void *)dep_entry);
@@ -2786,15 +2781,13 @@ void route_map_init(void)
        route_match_vec = vector_init(1);
        route_set_vec = vector_init(1);
        route_map_master_hash =
-               hash_create_size(8, route_map_hash_key_make,
-                                route_map_hash_cmp,
+               hash_create_size(8, route_map_hash_key_make, route_map_hash_cmp,
                                 "Route Map Master Hash");
 
        for (i = 1; i < ROUTE_MAP_DEP_MAX; i++)
-               route_map_dep_hash[i] =
-                       hash_create_size(8, route_map_dep_hash_make_key,
-                                        route_map_dep_hash_cmp,
-                                        "Route Map Dep Hash");
+               route_map_dep_hash[i] = hash_create_size(
+                       8, route_map_dep_hash_make_key, route_map_dep_hash_cmp,
+                       "Route Map Dep Hash");
 
        cmd_variable_handler_register(rmap_var_handlers);