Merge pull request #816 from bazsi/filterx-message-value-inline-accessors

filterx/object-message-value: move get_type/get_value methods to be inline

Author: MrAnno

lib/filterx/object-message-value.c

@@ -31,16 +31,6 @@
 #include "logmsg/type-hinting.h"
 #include "str-utils.h"
 
-/* an object representing a (type, value) pair extracted as an rvalue (e.g.
- * cannot be assigned to as it is not part of the message) */
-typedef struct _FilterXMessageValue
-{
-  FilterXObject super;
-  const gchar *repr;
-  gsize repr_len;
-  LogMessageValueType type;
-  gchar *buf;
-} FilterXMessageValue;
 
 gboolean
 filterx_message_value_get_string_ref(FilterXObject *s, const gchar **value, gsize *len)
@@ -403,23 +393,6 @@ _len(FilterXObject *s, guint64 *len)
   return FALSE;
 }
 
-LogMessageValueType
-filterx_message_value_get_type(FilterXObject *s)
-{
-  FilterXMessageValue *self = (FilterXMessageValue *) s;
-  return self->type;
-}
-
-const gchar *
-filterx_message_value_get_value(FilterXObject *s, gsize *len)
-{
-  FilterXMessageValue *self = (FilterXMessageValue *) s;
-
-  g_assert(len);
-  *len = self->repr_len;
-  return self->repr;
-}
-
 /* NOTE: the caller must ensure that repr lives as long as the constructed object, avoids copying */
 FilterXObject *
 filterx_message_value_new_borrowed(const gchar *repr, gssize repr_len, LogMessageValueType type)

lib/filterx/object-message-value.h

@@ -24,15 +24,23 @@
 
 #include "filterx/filterx-object.h"
 
+/* an object representing a (type, value) pair extracted as an rvalue (e.g.
+ * cannot be assigned to as it is not part of the message) */
+typedef struct _FilterXMessageValue
+{
+  FilterXObject super;
+  const gchar *repr;
+  gsize repr_len;
+  LogMessageValueType type;
+  gchar *buf;
+} FilterXMessageValue;
+
 FILTERX_DECLARE_TYPE(message_value);
 
 FilterXObject *filterx_message_value_new_borrowed(const gchar *repr, gssize repr_len, LogMessageValueType type);
 FilterXObject *filterx_message_value_new_ref(gchar *repr, gssize repr_len, LogMessageValueType type);
 FilterXObject *filterx_message_value_new(const gchar *repr, gssize repr_len, LogMessageValueType type);
 
-LogMessageValueType filterx_message_value_get_type(FilterXObject *s);
-const gchar *filterx_message_value_get_value(FilterXObject *s, gsize *len);
-
 gboolean filterx_message_value_get_string_ref(FilterXObject *s, const gchar **value, gsize *len);
 gboolean filterx_message_value_get_bytes_ref(FilterXObject *s, const gchar **value, gsize *len);
 gboolean filterx_message_value_get_protobuf_ref(FilterXObject *s, const gchar **value, gsize *len);
@@ -46,4 +54,22 @@ gboolean filterx_message_value_get_json(FilterXObject *s, struct json_object **v
 /* unmarshal a message representation into a FilterXObject */
 FilterXObject *filterx_unmarshal_repr(const gchar *repr, gssize repr_len, LogMessageValueType t);
 
+static inline LogMessageValueType
+filterx_message_value_get_type(FilterXObject *s)
+{
+  FilterXMessageValue *self = (FilterXMessageValue *) s;
+  return self->type;
+}
+
+static inline const gchar *
+filterx_message_value_get_value(FilterXObject *s, gsize *len)
+{
+  FilterXMessageValue *self = (FilterXMessageValue *) s;
+
+  g_assert(len);
+  *len = self->repr_len;
+  return self->repr;
+}
+
+
 #endif