ldns: fix the build in FreeBSD's base system

This adds a copy of the function prototypes for internal functions where
necessary.

It effectively works around the following compilation error:
error: no previous prototype for function [-Werror,-Wmissing-prototypes]

Tested on FreeBSD/amd64 (14.0-CURRENT).

diff --git a/dnssec_zone.c b/dnssec_zone.c
index 7be6791e7f5db6a44074dcd9360b5066148f3541..013517f4ac1a64bea6076b733856b63f48a0e1f2 100644 (file)
--- a/dnssec_zone.c
+++ b/dnssec_zone.c
@@ -605,10 +605,6 @@ ldns_todo_nsec3_ents_node_free(ldns_rbnode_t *node, void *arg) {
        LDNS_FREE(node);
 }
 
-ldns_status _ldns_rr_new_frm_fp_l_internal(ldns_rr **newrr, FILE *fp,
-               uint32_t *default_ttl, ldns_rdf **origin, ldns_rdf **prev,
-               int *line_nr, bool *explicit_ttl);
-
 ldns_status
 ldns_dnssec_zone_new_frm_fp_l(ldns_dnssec_zone** z, FILE* fp, const ldns_rdf* origin,
                uint32_t default_ttl, ldns_rr_class ATTR_UNUSED(c), int* line_nr)
@@ -1914,6 +1910,9 @@ rr_list2dnssec_rrs(ldns_rr_list *rr_list, ldns_dnssec_rrs **rrs,
 }
 
 
+ldns_status
+dnssec_zone_equip_zonemd(ldns_dnssec_zone *zone,
+               ldns_rr_list *new_rrs, ldns_key_list *key_list, int signflags);
 ldns_status
 dnssec_zone_equip_zonemd(ldns_dnssec_zone *zone,
                ldns_rr_list *new_rrs, ldns_key_list *key_list, int signflags)

diff --git a/edns.c b/edns.c
index 3d002d67ed8c8cd8375756be4334b73220501ee2..bc374835c3e77562fc03924646398dc19ae58e7e 100644 (file)
--- a/edns.c
+++ b/edns.c
@@ -73,21 +73,21 @@ ldns_edns_get_wireformat_buffer(const ldns_edns_option *edns)
 }
 
 /* write */
-void
+static void
 ldns_edns_set_size(ldns_edns_option *edns, size_t size)
 {
        assert(edns != NULL);
        edns->_size = size;
 }
 
-void
+static void
 ldns_edns_set_code(ldns_edns_option *edns, ldns_edns_option_code code)
 {
        assert(edns != NULL);
        edns->_code = code;
 }
 
-void
+static void
 ldns_edns_set_data(ldns_edns_option *edns, void *data)
 {
        /* only copy the pointer */

diff --git a/packet.c b/packet.c
index 4d68c234e2259140dd703d0de0b4641bf41d39a1..059cc09b0f976e098eb33e31c2849a740b7ee29e 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -758,6 +758,8 @@ ldns_pkt_edns(const ldns_pkt *pkt)
               );
 }
 
+ldns_edns_option_list*
+pkt_edns_data2edns_option_list(const ldns_rdf *edns_data);
 ldns_edns_option_list*
 pkt_edns_data2edns_option_list(const ldns_rdf *edns_data)
 {

diff --git a/rr.c b/rr.c
index 95ab71d349467ce2b5bc292fcc2880ca549459cb..6167a7aa19389282402999d783f618f2958c1a2b 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -721,6 +721,10 @@ ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin,
        return ldns_rr_new_frm_fp_l(newrr, fp, ttl, origin, prev, NULL);
 }
 
+ldns_status
+_ldns_rr_new_frm_fp_l_internal(ldns_rr **newrr, FILE *fp,
+               uint32_t *default_ttl, ldns_rdf **origin, ldns_rdf **prev,
+               int *line_nr, bool *explicit_ttl);
 ldns_status
 _ldns_rr_new_frm_fp_l_internal(ldns_rr **newrr, FILE *fp,
                uint32_t *default_ttl, ldns_rdf **origin, ldns_rdf **prev,

diff --git a/str2host.c b/str2host.c
index 5b78e5bc5907a4ab49c74ec3dffcb3d19b4dae63..4617aa3c7a05313698870f8e9c43e1129c028249 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -2198,7 +2198,7 @@ static const size_t svcparam_key_defs_len = sizeof(svcparam_key_defs)
 /* svcparam_key2buffer_str() should actually be in host2str.c, but we need the
  * svcparam_key_defs for it and it is not an exposed symbol anyway.
  */
-ldns_status svcparam_key2buffer_str(ldns_buffer *output, uint16_t key)
+static ldns_status svcparam_key2buffer_str(ldns_buffer *output, uint16_t key)
 {
        if (key <= LDNS_SVCPARAM_KEY_LAST_KEY)
                ldns_buffer_write_string(output, svcparam_key_defs[key].str);

diff --git a/util.c b/util.c
index 807a99e2308d3bf8f511e135a0ca997ac1504e0c..662aa23a96d161394db205e04276e421eb0c399a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -317,6 +317,8 @@ ldns_serial_arithmetics_gmtime_r(int32_t time, time_t now, struct tm *result)
 #endif
 /* alias function because of previously used wrong spelling */
 struct tm *
+ldns_serial_arithmitics_gmtime_r(int32_t time, time_t now, struct tm *result);
+struct tm *
 ldns_serial_arithmitics_gmtime_r(int32_t time, time_t now, struct tm *result)
 {
        return ldns_serial_arithmetics_gmtime_r(time, now, result);