Fix compiling issue led by vppapigen rework

Change-Id: I2e7cc0f0302476e64f4aae328bc56e96cf6150b0
Signed-off-by: Hongjun Ni <[email protected]>
(cherry picked from commit 2fd1760193f985fb3db861fae21219b6a83d090c)

diff --git a/nsh-plugin/Makefile.am b/nsh-plugin/Makefile.am
index 3f73fda..62eb5d8 100644 (file)
--- a/nsh-plugin/Makefile.am
+++ b/nsh-plugin/Makefile.am
@@ -42,7 +42,7 @@ SUFFIXES = .api.h .api
 vpp-api/%.api.h: nsh/%.api
        mkdir -p `dirname $@` ; \
        $(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-       | vppapigen --input - --output $@ --show-name $@
+       | vppapigen --includedir $(top_srcdir) --input $< --output $@
 
 nobase_include_HEADERS =                       \
   vpp-api/nsh_all_api_h.h                      \

diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am
index f85e163..c6aa0b6 100644 (file)
--- a/nsh-plugin/java/Makefile.am
+++ b/nsh-plugin/java/Makefile.am
@@ -63,6 +63,6 @@ $(jarfile_jnsh_sfc): libjvpp_nsh.la
 nsh.api.json: $(api_file)
        @echo "  jNsh_sfc API"; \
        $(CC) $(CPPFLAGS) -E -P -C -x c $^ \
-       | vppapigen --input $(api_file) --json $@
+       | vppapigen --input $^ JSON --output $@
 
 all-local: $(jarfile_jnsh_sfc)

diff --git a/nsh-plugin/nsh/nsh_output.c b/nsh-plugin/nsh/nsh_output.c
index 5671463..f0ac673 100644 (file)
--- a/nsh-plugin/nsh/nsh_output.c
+++ b/nsh-plugin/nsh/nsh_output.c
@@ -201,8 +201,10 @@ nsh_output_inline (vlib_main_t * vm,
             }
           if (is_midchain)
           {
-              adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
-              adj1->sub_type.midchain.fixup_func(vm, adj1, p1);
+              adj0->sub_type.midchain.fixup_func
+                (vm, adj0, p0, adj0->sub_type.midchain.fixup_data);
+              adj1->sub_type.midchain.fixup_func
+                (vm, adj1, p1, adj1->sub_type.midchain.fixup_data);
           }
 
           p0->error = error_node->errors[error0];
@@ -286,7 +288,8 @@ nsh_output_inline (vlib_main_t * vm,
             }
           if (is_midchain)
           {
-              adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
+              adj0->sub_type.midchain.fixup_func
+                (vm, adj0, p0, adj0->sub_type.midchain.fixup_data);
           }
 
           p0->error = error_node->errors[error0];