From 0eb2b16f95c0c43302be79a1c4df8b828ac97e37 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 6 Apr 2017 09:37:00 +0200
Subject: [PATCH] jvpp: remove unused print&endian headers (fixes VPP-688)

Change-Id: I97e03d98758a08b1f75a9a1f35f0181385a10ae8
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 src/vpp-api/java/jvpp-acl/jvpp_acl.c                | 13 ++-----------
 src/vpp-api/java/jvpp-core/jvpp_core.c              |  9 ---------
 src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c | 13 ++-----------
 src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c       | 13 ++-----------
 src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c   | 13 ++-----------
 src/vpp-api/java/jvpp-snat/jvpp_snat.c              | 13 ++-----------
 6 files changed, 10 insertions(+), 64 deletions(-)

diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.c b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
index b59f5358259..0375356d820 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.c
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
@@ -20,15 +20,6 @@
 #include <acl/acl_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <acl/acl_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <acl/acl_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_acl_JVppAclImpl_init0
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-core/jvpp_core.c b/src/vpp-api/java/jvpp-core/jvpp_core.c
index 8c579811af9..627bc10b242 100644
--- a/src/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/src/vpp-api/java/jvpp-core/jvpp_core.c
@@ -20,15 +20,6 @@
 #include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
index bf0e9f0ae7c..9131ccb2a07 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -20,15 +20,6 @@
 #include <ioam/export/ioam_export_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamexport_JVppIoamexportImpl_init0
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
index f7e2b901cdf..5f28344e579 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -20,15 +20,6 @@
 #include <ioam/lib-pot/pot_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
index 5a0fda6919e..1c470b536f2 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
@@ -20,15 +20,6 @@
 #include <ioam/lib-trace/trace_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl_init0
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-snat/jvpp_snat.c b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
index 312657720ab..e994cdb6c52 100644
--- a/src/vpp-api/java/jvpp-snat/jvpp_snat.c
+++ b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
@@ -20,15 +20,6 @@
 #include <snat/snat_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <snat/snat_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <snat/snat_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@ JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_snat_JVppSnatImpl_init0
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
-- 
2.16.6