From 2de6376e9adfa93992b8c76662e95339094c9035 Mon Sep 17 00:00:00 2001 From: Andrej Kozemcak Date: Fri, 18 Jan 2019 15:11:22 +0100 Subject: BAPI: Rename ERROR function. Change-Id: I00807f9df9a6d2f5be601902651ea32b138a5ee5 Signed-off-by: Andrej Kozemcak --- src/plugins/bapi/bapi.c | 10 +++++----- src/plugins/bapi/bapi_interface.c | 14 +++++++------- src/plugins/bapi/bapi_ip.c | 4 ++-- src/scvpp/src/sc_vpp_comm.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/plugins/bapi/bapi.c b/src/plugins/bapi/bapi.c index 74a9121..25939cf 100644 --- a/src/plugins/bapi/bapi.c +++ b/src/plugins/bapi/bapi.c @@ -37,7 +37,7 @@ vapi_mode_e g_vapi_mode = VAPI_MODE_NONBLOCKING; vapi_error_e bin_api_connect(const char *client_name, vapi_mode_e vapi_mode) { vapi_error_e rv = vapi_ctx_alloc(&g_vapi_ctx); if (VAPI_OK != rv) { - SRP_LOG_DBG_MSG("cannot allocate context"); + SC_LOG_DBG_MSG("cannot allocate context"); return rv; } @@ -45,7 +45,7 @@ vapi_error_e bin_api_connect(const char *client_name, vapi_mode_e vapi_mode) { response_queue_size, vapi_mode, true); if (VAPI_OK != rv) { - SRP_LOG_DBG_MSG("error: connecting to vlib"); + SC_LOG_DBG_MSG("error: connecting to vlib"); return rv; } @@ -58,7 +58,7 @@ vapi_error_e bin_api_connect(const char *client_name, vapi_mode_e vapi_mode) { vapi_error_e bin_api_disconnect(void) { vapi_error_e rv = vapi_disconnect (g_vapi_ctx); if (VAPI_OK != rv) { - SRP_LOG_DBG("error: (rc:%d)", rv); + SC_LOG_DBG("error: (rc:%d)", rv); //return rv; } @@ -76,7 +76,7 @@ bool bapi_aton(const char *cp, u8 * buf) if (0 == ret) { - SRP_LOG_DBG("error: ipv4 address %s", cp); + SC_LOG_DBG("error: ipv4 address %s", cp); return false; } @@ -96,7 +96,7 @@ vapi_retval_cb(const char* func_name, i32 retval) { if (retval) { - SRP_LOG_DBG("%s: bad retval=%d", func_name, retval); + SC_LOG_DBG("%s: bad retval=%d", func_name, retval); } return VAPI_OK; diff --git a/src/plugins/bapi/bapi_interface.c b/src/plugins/bapi/bapi_interface.c index 76cd206..5e035fa 100644 --- a/src/plugins/bapi/bapi_interface.c +++ b/src/plugins/bapi/bapi_interface.c @@ -52,7 +52,7 @@ get_interface_id_cb (struct vapi_ctx_s *ctx, void *callback_ctx, else { assert(NULL != reply); - SRP_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, + SC_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, reply->interface_name); if (0 == strcmp((const char*)dctx->sw_interface_details.interface_name, @@ -83,12 +83,12 @@ bool get_interface_id(sw_interface_details_query_t * sw_interface_details_query) VAPI_CALL(vapi_sw_interface_dump(g_vapi_ctx, mp, get_interface_id_cb, sw_interface_details_query)); if (VAPI_OK != rv) { - SRP_LOG_DBG_MSG("vapi_sw_interface_dump"); + SC_LOG_DBG_MSG("vapi_sw_interface_dump"); return false; } if (!sw_interface_details_query->interface_found) - SRP_LOG_ERR("interface name %s: Can't find index", + SC_LOG_ERR("interface name %s: Can't find index", sw_interface_details_query->sw_interface_details.interface_name); return sw_interface_details_query->interface_found; @@ -111,7 +111,7 @@ get_interface_name_cb (struct vapi_ctx_s *ctx, void *callback_ctx, else { assert(reply && dctx); - SRP_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, reply->interface_name); + SC_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, reply->interface_name); if (dctx->sw_interface_details.sw_if_index == reply->sw_if_index) { @@ -136,12 +136,12 @@ bool get_interface_name(sw_interface_details_query_t * sw_interface_details_quer VAPI_CALL(vapi_sw_interface_dump (g_vapi_ctx, mp, get_interface_name_cb, sw_interface_details_query)); if (VAPI_OK != rv) { - SRP_LOG_DBG_MSG("vapi_sw_interface_dump"); + SC_LOG_DBG_MSG("vapi_sw_interface_dump"); return false; } if (!sw_interface_details_query->interface_found) - SRP_LOG_ERR("interface index %u: Can't find name", + SC_LOG_ERR("interface index %u: Can't find name", sw_interface_details_query->sw_interface_details.sw_if_index); return sw_interface_details_query->interface_found; @@ -159,7 +159,7 @@ sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx, else { assert (NULL != reply); - SRP_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, + SC_LOG_DBG("Interface dump entry: [%u]: %s\n", reply->sw_if_index, reply->interface_name); } diff --git a/src/plugins/bapi/bapi_ip.c b/src/plugins/bapi/bapi_ip.c index 6e4f530..aa8baa5 100644 --- a/src/plugins/bapi/bapi_ip.c +++ b/src/plugins/bapi/bapi_ip.c @@ -79,7 +79,7 @@ vapi_error_e bin_api_ip_add_del_route( { ARG_CHECK4(VAPI_EINVAL, reply, dst_address, next_hop, interface_name); - SRP_LOG_DBG("Interface: %s", interface_name); + SC_LOG_DBG("Interface: %s", interface_name); sw_interface_details_query_t query = {0}; sw_interface_details_query_set_name(&query, interface_name); @@ -99,7 +99,7 @@ vapi_error_e bin_api_ip_add_del_route( mp->payload.dst_address_length = dst_address_length; mp->payload.table_id = table_id; mp->payload.next_hop_sw_if_index = query.sw_interface_details.sw_if_index; - SRP_LOG_DBG("Interface: %s, index: %d", interface_name, query.sw_interface_details.sw_if_index); + SC_LOG_DBG("Interface: %s, index: %d", interface_name, query.sw_interface_details.sw_if_index); if (!bapi_aton(dst_address, mp->payload.dst_address)) return VAPI_EINVAL; diff --git a/src/scvpp/src/sc_vpp_comm.h b/src/scvpp/src/sc_vpp_comm.h index b5bb333..0041b8f 100644 --- a/src/scvpp/src/sc_vpp_comm.h +++ b/src/scvpp/src/sc_vpp_comm.h @@ -66,7 +66,7 @@ DEFINE_VAPI_MSG_IDS_VPE_API_JSON; { \ if (NULL == (arg)) \ { \ - ERROR(#arg ":NULL pointer passed."); \ + SC_LOG_ERR_MSG(#arg ":NULL pointer passed."); \ return (retval); \ } \ } \ -- cgit 1.2.3-korg