From 614e97d87b46853384cf0dcf1d59aaf9f4b2fa92 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 31 Jan 2017 13:47:08 -0600 Subject: [PATCH] Convert M() and M2() macros to honor their second, mp, parameter. Now that all the M() and M2() uses properly supply a message pointer as second parameter, fix the macros to use it. Change-Id: I0b8f4848416c3fa2e06755ad6ea7171b7c546124 Signed-off-by: Jon Loeliger --- build-root/emacs-lisp/plugin-test-skel.el | 4 ++-- src/vlibapi/vat_helper_macros.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-root/emacs-lisp/plugin-test-skel.el b/build-root/emacs-lisp/plugin-test-skel.el index 23f792fa472..d69aa2ce7c0 100644 --- a/build-root/emacs-lisp/plugin-test-skel.el +++ b/build-root/emacs-lisp/plugin-test-skel.el @@ -109,7 +109,7 @@ _(" PLUGIN-NAME "_ENABLE_DISABLE_REPLY, " plugin-name "_enable_disable_reply) /* M: construct, but don't yet send a message */ -#define M(T,t) \\ +#define M(T, mp) \\ do { \\ vam->result_ready = 0; \\ mp = vl_msg_api_alloc(sizeof(*mp)); \\ @@ -118,7 +118,7 @@ do { \\ mp->client_index = vam->my_client_index; \\ } while(0); -#define M2(T,t,n) \\ +#define M2(T, mp, n) \\ do { \\ vam->result_ready = 0; \\ mp = vl_msg_api_alloc(sizeof(*mp)+(n)); \\ diff --git a/src/vlibapi/vat_helper_macros.h b/src/vlibapi/vat_helper_macros.h index dc91c9f5023..b2fbb86d928 100644 --- a/src/vlibapi/vat_helper_macros.h +++ b/src/vlibapi/vat_helper_macros.h @@ -20,7 +20,7 @@ #define __vat_helper_macros_h__ /* M: construct, but don't yet send a message */ -#define M(T,t) \ +#define M(T, mp) \ do { \ vam->result_ready = 0; \ mp = vl_msg_api_alloc_as_if_client(sizeof(*mp)); \ @@ -29,7 +29,7 @@ do { \ mp->client_index = vam->my_client_index; \ } while(0); -#define M2(T,t,n) \ +#define M2(T, mp, n) \ do { \ vam->result_ready = 0; \ mp = vl_msg_api_alloc_as_if_client(sizeof(*mp)+(n)); \