X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_types.h;h=8cd47bb770f33a261a04b7746d17f725ef58d665;hb=33a58171e;hp=c4d8f3bd060a3fbe0ab45c296c5827d26870fb31;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git

diff --git a/src/vlibapi/api_types.h b/src/vlibapi/api_types.h
index c4d8f3bd060..8cd47bb770f 100644
--- a/src/vlibapi/api_types.h
+++ b/src/vlibapi/api_types.h
@@ -21,11 +21,16 @@
 #define included_api_types_h
 
 #include <stdbool.h>
-
+#include <stdarg.h>
 #include <vppinfra/types.h>
 #include <arpa/inet.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /* VPP API string type */
 typedef struct
 {
@@ -33,31 +38,15 @@ typedef struct
   u8 buf[0];
 } __attribute__ ((packed)) vl_api_string_t;
 
-static inline int
-vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str)
-{
-  memcpy(str->buf, buf, 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;
-}
+extern int vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str);
+extern int vl_api_vec_to_api_string (const u8 *vec, vl_api_string_t * str);
+extern u8 * vl_api_from_api_string (vl_api_string_t * astr);
+extern u32 vl_api_string_len (vl_api_string_t * astr);
+extern u8 * vl_api_from_api_to_vec (vl_api_string_t *astr);
+extern u8 *vl_api_format_string (u8 *s, va_list *args);
 
-static inline u32
-vl_api_string_len (vl_api_string_t * astr)
-{
-  return ntohl (astr->length);
-}
-
-static inline char *
-vl_api_from_api_string_c (vl_api_string_t *astr)
-{
-  return strndup((char *)astr->buf, ntohl (astr->length));
+#ifdef __cplusplus
 }
+#endif
 
 #endif