summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-08-22 04:27:15 -0700
committerJohn Lo <loj@cisco.com>2018-08-22 16:03:26 +0000
commit571ab20d1da227fb66d52ed52cce0cbd4591e1c9 (patch)
tree2e48450bf4119aef5363e265ef728395430225e8 /src/plugins
parent828d27ea0edb97280a0164041a286973fa74b5a2 (diff)
Consolidate the [un]format_mac_address implementations
Change-Id: Ic4c42c5610a827234e6582501f0ddcba47aa34ee Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/mactime/mactime.h8
-rw-r--r--src/plugins/mactime/mactime_test.c17
2 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/mactime/mactime.h b/src/plugins/mactime/mactime.h
index 2166d4a6735..1a13e41f606 100644
--- a/src/plugins/mactime/mactime.h
+++ b/src/plugins/mactime/mactime.h
@@ -104,14 +104,6 @@ extern vlib_node_registration_t mactime_tx_node;
void mactime_send_create_entry_message (u8 * mac_address);
-static inline u8 *
-format_mac_address (u8 * s, va_list * args)
-{
- u8 *a = va_arg (*args, u8 *);
- return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
/* Periodic function events */
#define MACTIME_EVENT1 1
#define MACTIME_EVENT2 2
diff --git a/src/plugins/mactime/mactime_test.c b/src/plugins/mactime/mactime_test.c
index 9ba28da2fc3..309b101bad9 100644
--- a/src/plugins/mactime/mactime_test.c
+++ b/src/plugins/mactime/mactime_test.c
@@ -19,6 +19,7 @@
#include <vlibmemory/api.h>
#include <vppinfra/error.h>
#include <vppinfra/time_range.h>
+#include <vnet/ethernet/ethernet.h>
uword vat_unformat_sw_if_index (unformat_input_t * input, va_list * args);
@@ -79,22 +80,6 @@ _(mactime_add_del_range_reply)
foreach_standard_reply_retval_handler;
#undef _
-static u8 *
-format_mac_address (u8 * s, va_list * args)
-{
- u8 *a = va_arg (*args, u8 *);
- return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
- a[0], a[1], a[2], a[3], a[4], a[5]);
-}
-
-static uword
-unformat_mac_address (unformat_input_t * input, va_list * args)
-{
- u8 *a = va_arg (*args, u8 *);
- return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
- &a[4], &a[5]);
-}
-
/*
* Table of message reply handlers, must include boilerplate handlers
* we just generated