Makefile.am: Clean flake8-check too.

[cascardo/ovs.git] / tests / test-rstp.c

diff --git a/tests/test-rstp.c b/tests/test-rstp.c
index afc5b60..3eca15c 100644 (file)
--- a/tests/test-rstp.c
+++ b/tests/test-rstp.c
@@ -1,5 +1,5 @@
 #include <config.h>
-
+#undef NDEBUG
 #include "rstp-common.h"
 #include <assert.h>
 #include <ctype.h>
@@ -9,8 +9,9 @@
 #include <stdlib.h>
 #include "ofpbuf.h"
 #include "ovstest.h"
+#include "dp-packet.h"
 #include "packets.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
 
 #define MAX_PORTS 10
 
@@ -74,7 +75,7 @@ new_test_case(void)
 
 /* This callback is called with rstp_mutex held. */
 static void
-send_bpdu(struct ofpbuf *pkt, void *port_, void *b_)
+send_bpdu(struct dp_packet *pkt, void *port_, void *b_)
     OVS_REQUIRES(rstp_mutex)
 {
     struct bridge *b = b_;
@@ -85,8 +86,8 @@ send_bpdu(struct ofpbuf *pkt, void *port_, void *b_)
     assert(port_no < b->n_ports);
     lan = b->ports[port_no];
     if (lan) {
-        const void *data = ofpbuf_l3(pkt);
-        size_t size = (char *) ofpbuf_tail(pkt) - (char *) data;
+        const void *data = dp_packet_l3(pkt);
+        size_t size = (char *) dp_packet_tail(pkt) - (char *) data;
         int i;
 
         for (i = 0; i < lan->n_conns; i++) {
@@ -103,7 +104,7 @@ send_bpdu(struct ofpbuf *pkt, void *port_, void *b_)
             }
         }
     }
-    ofpbuf_delete(pkt);
+    dp_packet_delete(pkt);
 }
 
 static struct bridge *
@@ -335,10 +336,9 @@ simulate(struct test_case *tc, int granularity)
     }
 }
 
-static void
+OVS_NO_RETURN static void
 err(const char *message, ...)
-    PRINTF_FORMAT(1, 2)
-    NO_RETURN;
+    OVS_PRINTF_FORMAT(1, 2);
 
 static void
 err(const char *message, ...)
@@ -356,7 +356,7 @@ err(const char *message, ...)
 
 static void
 warn(const char *message, ...)
-    PRINTF_FORMAT(1, 2);
+    OVS_PRINTF_FORMAT(1, 2);
 
 static void
 warn(const char *message, ...)