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 3c7b4d251a238d77b3c5a23d6dc503b0942e1173..dadadd573cdfdedf8c4bcfc0828c91660acdc064 100644 (file)
--- 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 d77a6cbb73a945060ca98eacf23e14eea3a0a2b2..e4370fd78097ccc794a59876246405c3d5e81410 100644 (file)
--- 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.