From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 13 Aug 2018 10:53:56 +0000 (+0200)
Subject: libknot/pkt: make knot_rrset_to_wire static inline again
X-Git-Tag: v2.8.0~283
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=423f77b5902c8f048a4e3aaca442b78cba342f30;p=thirdparty%2Fknot-dns.git

libknot/pkt: make knot_rrset_to_wire static inline again
---

diff --git a/src/libknot/packet/rrset-wire.c b/src/libknot/packet/rrset-wire.c
index 3c7b4d251a..dadadd573c 100644
--- a/src/libknot/packet/rrset-wire.c
+++ b/src/libknot/packet/rrset-wire.c
@@ -509,13 +509,6 @@ int knot_rrset_to_wire_extra(const knot_rrset_t *rrset, uint8_t *wire,
 	return write - wire;
 }
 
-_public_
-int knot_rrset_to_wire(const knot_rrset_t *rrset, uint8_t *wire,
-                       uint16_t max_size, knot_compr_t *compr)
-{
-	return knot_rrset_to_wire_extra(rrset, wire, max_size, 0, compr, 0);
-}
-
 _public_
 int knot_rrset_to_wire_rotate(const knot_rrset_t *rrset, uint8_t *wire,
                               uint16_t max_size, uint16_t rotate,
diff --git a/src/libknot/packet/rrset-wire.h b/src/libknot/packet/rrset-wire.h
index d77a6cbb73..e4370fd780 100644
--- a/src/libknot/packet/rrset-wire.h
+++ b/src/libknot/packet/rrset-wire.h
@@ -48,10 +48,12 @@ int knot_rrset_to_wire_rotate(const knot_rrset_t *rrset, uint8_t *wire,
                               uint16_t max_size, uint16_t rotate,
                               knot_compr_t *compr);
 
-/* TODO: change to static inline in next major version. */
 /*! \brief Same as knot_rrset_to_wire_extra but without rrset rotation and flags. */
-int knot_rrset_to_wire(const knot_rrset_t *rrset, uint8_t *wire,
-                       uint16_t max_size, knot_compr_t *compr);
+static inline int knot_rrset_to_wire(const knot_rrset_t *rrset, uint8_t *wire,
+                                     uint16_t max_size, knot_compr_t *compr)
+{
+	return knot_rrset_to_wire_extra(rrset, wire, max_size, 0, compr, 0);
+}
 
 /*!
 * \brief Creates one RR from wire, stores it into \a rrset.