]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: revert table.h change for C++
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 11 Feb 2019 12:10:16 +0000 (13:10 +0100)
committerRenato Westphal <renato@opensourcerouting.org>
Mon, 11 Feb 2019 17:49:49 +0000 (15:49 -0200)
This reverts the lib/table.h change from commit
049b31f7d810fd70069e3edbbd3fea6b5c7af98f.

Signed-off-by: David Lamparter <equinox@diac24.net>
lib/table.h

index a251d2206736905a660f0eeb292e424a47a36e5f..541d74d77bff9f1c3b32d000acc4dfa6ad43bdd1 100644 (file)
@@ -275,15 +275,12 @@ static inline struct route_node *route_table_iter_next(route_table_iter_t *iter)
                break;
 
        case RT_ITER_STATE_PAUSED:
-       {
-               union prefixconstptr cp = {.p = &iter->pause_prefix};
 
                /*
                 * Start with the node following pause_prefix.
                 */
-               node = route_table_get_next(iter->table, cp);
-       }
-       break;
+               node = route_table_get_next(iter->table, &iter->pause_prefix);
+               break;
 
        case RT_ITER_STATE_DONE:
                return NULL;