From: Miek Gieben Date: Wed, 25 Jan 2006 09:00:45 +0000 (+0000) Subject: more const prototypes added X-Git-Tag: release-1.1.0~386 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74aa112a65cdbfb6d65fbeb847d4e38ccf7a829b;p=thirdparty%2Fldns.git more const prototypes added --- diff --git a/examples/Makefile.in b/examples/Makefile.in index 26861621..f59006e5 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -10,8 +10,8 @@ bindir = @bindir@ mandir = @mandir@ CC = @CC@ -CFLAGS = @CFLAGS@ -Wall -I. -CPPFLAGS = @CPPFLAGS@ +CFLAGS = @CFLAGS@ -Wall -I. +CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff --git a/examples/ldns-signzone.c b/examples/ldns-signzone.c index e0fe6f92..9599922e 100644 --- a/examples/ldns-signzone.c +++ b/examples/ldns-signzone.c @@ -84,7 +84,7 @@ main(int argc, char *argv[]) */ memset(&tm, 0, sizeof(tm)); - if (strptime(optarg, DATE_FORMAT, &tm) != NULL) { + if (strptime(optarg, DATE_FORMAT, &tm) != NULL) { c = c; expiration = (uint32_t) mktime_from_utc(&tm); } else if (strptime(optarg, SHORT_DATE_FORMAT, &tm) != NULL) { diff --git a/ldns/rr.h b/ldns/rr.h index dcdfbaa5..a128864b 100644 --- a/ldns/rr.h +++ b/ldns/rr.h @@ -347,7 +347,7 @@ void ldns_rr_set_class(ldns_rr *rr, ldns_rr_class rr_class); * \param[in] position the position the set the rdf * \return the old value in the rr, NULL on failyre */ -ldns_rdf* ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position); +ldns_rdf* ldns_rr_set_rdf(ldns_rr *rr, const ldns_rdf *f, size_t position); /** * sets rd_field member, it will be @@ -356,7 +356,7 @@ ldns_rdf* ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position); * \param[in] *f the data field member to set * \return bool */ -bool ldns_rr_push_rdf(ldns_rr *rr, ldns_rdf *f); +bool ldns_rr_push_rdf(ldns_rr *rr, const ldns_rdf *f); /** * removes a rd_field member, it will be @@ -434,7 +434,7 @@ void ldns_rr_list_set_rr_count(ldns_rr_list *rr_list, size_t count); * \return the old rr which was stored in the rr_list, or * NULL is the index was too large * set a specific rr */ -ldns_rr * ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count); +ldns_rr * ldns_rr_list_set_rr(ldns_rr_list *rr_list, const ldns_rr *r, size_t count); /** * returns a specific rr of an rrlist. @@ -486,7 +486,7 @@ ldns_rr_list* ldns_rr_list_cat_clone(ldns_rr_list *left, ldns_rr_list *right); * \param[in] rr the rr to push * \return false on error, otherwise true */ -bool ldns_rr_list_push_rr(ldns_rr_list *rr_list, ldns_rr *rr); +bool ldns_rr_list_push_rr(ldns_rr_list *rr_list, const ldns_rr *rr); /** * pops the last rr from an rrlist. @@ -677,6 +677,6 @@ ldns_rr_type ldns_rdf2rr_type(const ldns_rdf *rd); /* added while doing lua */ /* TODO document or delete it */ -bool ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count); +bool ldns_rr_list_insert_rr(ldns_rr_list *rr_list, const ldns_rr *r, size_t count); #endif /* LDNS_RR_H */ diff --git a/rr.c b/rr.c index 8bf554a2..0c7a9c33 100644 --- a/rr.c +++ b/rr.c @@ -524,7 +524,7 @@ ldns_rr_set_class(ldns_rr *rr, ldns_rr_class rr_class) } ldns_rdf * -ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position) +ldns_rr_set_rdf(ldns_rr *rr, const ldns_rdf *f, size_t position) { size_t rd_count; ldns_rdf *pop; @@ -535,7 +535,7 @@ ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position) rdata_fields = rr->_rdata_fields; /* dicard the old one */ pop = rr->_rdata_fields[position]; - rr->_rdata_fields[position] = f; + rr->_rdata_fields[position] = (ldns_rdf*)f; return pop; } else { return NULL; @@ -543,7 +543,7 @@ ldns_rr_set_rdf(ldns_rr *rr, ldns_rdf *f, size_t position) } bool -ldns_rr_push_rdf(ldns_rr *rr, ldns_rdf *f) +ldns_rr_push_rdf(ldns_rr *rr, const ldns_rdf *f) { size_t rd_count; ldns_rdf **rdata_fields; @@ -559,7 +559,7 @@ ldns_rr_push_rdf(ldns_rr *rr, ldns_rdf *f) /* add the new member */ rr->_rdata_fields = rdata_fields; - rr->_rdata_fields[rd_count] = f; + rr->_rdata_fields[rd_count] = (ldns_rdf*)f; ldns_rr_set_rd_count(rr, rd_count + 1); return true; @@ -640,7 +640,7 @@ ldns_rr_list_rr_count(ldns_rr_list *rr_list) } ldns_rr * -ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count) +ldns_rr_list_set_rr(ldns_rr_list *rr_list, const ldns_rr *r, size_t count) { ldns_rr *old; @@ -651,12 +651,12 @@ ldns_rr_list_set_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count) old = ldns_rr_list_rr(rr_list, count); /* overwrite old's pointer */ - rr_list->_rrs[count] = r; + rr_list->_rrs[count] = (ldns_rr*)r; return old; } bool -ldns_rr_list_insert_rr(ldns_rr_list *rr_list, ldns_rr *r, size_t count) +ldns_rr_list_insert_rr(ldns_rr_list *rr_list, const ldns_rr *r, size_t count) { uint16_t c, i; ldns_rr *pop[101]; /* WRONG AMOUNT */ @@ -847,7 +847,7 @@ ldns_rr_list_subtype_by_rdf(ldns_rr_list *l, ldns_rdf *r, size_t pos) } bool -ldns_rr_list_push_rr(ldns_rr_list *rr_list, ldns_rr *rr) +ldns_rr_list_push_rr(ldns_rr_list *rr_list, const ldns_rr *rr) { size_t rr_count; ldns_rr **rrs; @@ -864,7 +864,7 @@ ldns_rr_list_push_rr(ldns_rr_list *rr_list, ldns_rr *rr) /* add the new member */ rr_list->_rrs = rrs; - rr_list->_rrs[rr_count] = rr; + rr_list->_rrs[rr_count] = (ldns_rr*)rr; ldns_rr_list_set_rr_count(rr_list, rr_count + 1); return true;