From 5d5f85f5e4003476fb6d9a0ccd6ad58ad90e5138 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 3 Dec 2021 10:48:13 +0000 Subject: api: refactor to use REPLY_MSG_ID_BASE #define REPLY_MSG_ID_BASE is the standard way to define reply message id base, so this refactor makes all the files use that. This is a preparation patch for future safety add-ons which rely on REPLY_MACRO* parameters to be preprocessor tokens identifying the message instead, Type: refactor Signed-off-by: Klement Sekera Change-Id: Ibe3e056a3d9326d08af45bbcb25588b11e870141 --- src/plugins/rdma/api.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/plugins/rdma') diff --git a/src/plugins/rdma/api.c b/src/plugins/rdma/api.c index 7fe77105596..8455cc456aa 100644 --- a/src/plugins/rdma/api.c +++ b/src/plugins/rdma/api.c @@ -27,6 +27,7 @@ #include #include +#define REPLY_MSG_ID_BASE (rm->msg_id_base) #include static rdma_mode_t @@ -103,7 +104,7 @@ vl_api_rdma_create_v3_t_handler (vl_api_rdma_create_v3_t *mp) rdma_create_if (vm, &args); rv = args.rv; - REPLY_MACRO2 (VL_API_RDMA_CREATE_V3_REPLY + rm->msg_id_base, + REPLY_MACRO2 (VL_API_RDMA_CREATE_V3_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); } @@ -131,10 +132,8 @@ vl_api_rdma_create_v2_t_handler (vl_api_rdma_create_v2_t * mp) rv = args.rv; /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_RDMA_CREATE_V2_REPLY + rm->msg_id_base, - ({ - rmp->sw_if_index = ntohl (args.sw_if_index); - })); + REPLY_MACRO2 (VL_API_RDMA_CREATE_V2_REPLY, + ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); /* *INDENT-ON* */ } @@ -163,10 +162,8 @@ vl_api_rdma_create_t_handler (vl_api_rdma_create_t * mp) rv = args.rv; /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_RDMA_CREATE_REPLY + rm->msg_id_base, - ({ - rmp->sw_if_index = ntohl (args.sw_if_index); - })); + REPLY_MACRO2 (VL_API_RDMA_CREATE_REPLY, + ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); /* *INDENT-ON* */ } @@ -195,7 +192,7 @@ vl_api_rdma_delete_t_handler (vl_api_rdma_delete_t * mp) rdma_delete_if (vm, rd); reply: - REPLY_MACRO (VL_API_RDMA_DELETE_REPLY + rm->msg_id_base); + REPLY_MACRO (VL_API_RDMA_DELETE_REPLY); } /* set tup the API message handling tables */ -- cgit 1.2.3-korg