From 377860a7394970d339a33717a8c4c8cad328632f Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 21 Jun 2019 07:57:18 -0700 Subject: api: Remove the inlines file and replace with library functions using inlines exposes the users to the internal data types used by VPP, namely vec.h. This file does not compile with a C++ compiler. Type: feature Change-Id: I1544fdd9eae998309f865df61df78571bdb96903 Signed-off-by: Neale Ranns --- src/vlibapi/api_types_inlines.h | 59 ----------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 src/vlibapi/api_types_inlines.h (limited to 'src/vlibapi/api_types_inlines.h') diff --git a/src/vlibapi/api_types_inlines.h b/src/vlibapi/api_types_inlines.h deleted file mode 100644 index a26d91b5558..00000000000 --- a/src/vlibapi/api_types_inlines.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - *------------------------------------------------------------------ - * api_types.h - * - * Copyright (c) 2018 Cisco and/or its affiliates. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------ - */ - -static inline int -vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str) -{ - clib_memcpy_fast(str->buf, buf, len); - str->length = htonl (len); - return len + sizeof (u32); -} - -static inline int -vl_api_vec_to_api_string (const u8 *vec, vl_api_string_t * str) -{ - u32 len = vec_len(vec); - clib_memcpy(str->buf, vec, len); - str->length = htonl (len); - return len + sizeof (u32); -} - -/* Return a pointer to the API string (not nul terminated */ -static inline u8 * -vl_api_from_api_string (vl_api_string_t * astr) -{ - return astr->buf; -} - -static inline u32 -vl_api_string_len (vl_api_string_t * astr) -{ - return ntohl (astr->length); -} - -/* - * Returns a new vector. Remember to free it after use. - */ -static inline u8 * -vl_api_from_api_to_vec (vl_api_string_t *astr) -{ - u8 *v = 0; - vec_add(v, astr->buf, ntohl(astr->length)); - return v; -} -- cgit 1.2.3-korg