Type: fix
Fixes:
ab4d917
Change-Id: I226044f64e1577033798fd203a2e981c894830d6
Signed-off-by: Damjan Marion <damarion@cisco.com>
/* socket filename */
mp->socket_filename[ARRAY_LEN (mp->socket_filename) - 1] = 0;
/* socket filename */
mp->socket_filename[ARRAY_LEN (mp->socket_filename) - 1] = 0;
- rv = vnet_api_error (memif_socket_filename_add_del (
+ rv = vnet_get_api_error_and_free (memif_socket_filename_add_del (
is_add, socket_id, (char *) mp->socket_filename));
reply:
is_add, socket_id, (char *) mp->socket_filename));
reply:
if (mp->is_add && socket_id == (u32) ~0)
socket_id = memif_get_unused_socket_id ();
if (mp->is_add && socket_id == (u32) ~0)
socket_id = memif_get_unused_socket_id ();
+ rv = vnet_get_api_error_and_free (
memif_socket_filename_add_del (mp->is_add, socket_id, socket_filename));
vec_free (socket_filename);
memif_socket_filename_add_del (mp->is_add, socket_id, socket_filename));
vec_free (socket_filename);
- rv = vnet_api_error (memif_create_if (vm, &args));
+ rv = vnet_get_api_error_and_free (memif_create_if (vm, &args));
else
{
mif = pool_elt_at_index (mm->interfaces, hi->dev_instance);
else
{
mif = pool_elt_at_index (mm->interfaces, hi->dev_instance);
- rv = vnet_api_error (memif_delete_if (vm, mif));
+ rv = vnet_get_api_error_and_free (memif_delete_if (vm, mif));
}
REPLY_MACRO (VL_API_MEMIF_DELETE_REPLY);
}
REPLY_MACRO (VL_API_MEMIF_DELETE_REPLY);
+static_always_inline vnet_api_error_t
+vnet_get_api_error_and_free (clib_error_t *err)
+{
+ vnet_api_error_t rv = vnet_api_error (err);
+ clib_error_free (err);
+ return rv;
+}
+
#endif /* included_vnet_api_errno_h */
/*
#endif /* included_vnet_api_errno_h */
/*