Hi guys,
For some reason, functions in include/common/net_helper.h aren't inlined,
which will certainly be a problem the day we have multiple users of that
file.
The attached patch addresses this.
Regards,
Olivier
>From cd330f4d3befa15aa4956865445273ee7b657076 Mon Sep 17 00:00:00 2001
From: Olivier Houchard <ohouch...@haproxy.com>
Date: Wed, 13 Sep 2017 11:49:22 +0200
Subject: [PATCH] MINOR: net_helper: Inline functions meant to be inlined.
---
include/common/net_helper.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/common/net_helper.h b/include/common/net_helper.h
index 86809a684..78975144c 100644
--- a/include/common/net_helper.h
+++ b/include/common/net_helper.h
@@ -31,42 +31,42 @@
/* Functions to read various integer that may be unaligned */
/* Read a uint16_t */
-uint16_t readu16(const void *p)
+static inline uint16_t readu16(const void *p)
{
const union { uint16_t u16; } __attribute__((packed))*u = p;
return u->u16;
}
/* Read a int16_t */
-int16_t readi16(const void *p)
+static inline int16_t readi16(const void *p)
{
const union { int16_t i16; } __attribute__((packed))*u = p;
return u->i16;
}
/* Read a uint16_t, and convert from network order to host order */
-uint16_t readn16(const void *p)
+static inline uint16_t readn16(const void *p)
{
const union { uint16_t u16; } __attribute__((packed))*u = p;
return ntohs(u->u16);
}
/* Read a uint32_t */
-uint32_t readu32(const void *p)
+static inline uint32_t readu32(const void *p)
{
const union { uint32_t u32; } __attribute__((packed))*u = p;
return u->u32;
}
/* Read a int32_t */
-int16_t readi32(const void *p)
+static inline int16_t readi32(const void *p)
{
const union { int32_t i32; } __attribute__((packed))*u = p;
return u->i32;
}
/* Read a uint32_t, and convert from network order to host order */
-uint32_t readn32(const void *p)
+static inline uint32_t readn32(const void *p)
{
const union { uint32_t u32; } __attribute__((packed))*u = p;
return ntohl(u->u32);
--
2.13.3
