From: Miek Gieben Date: Tue, 14 Mar 2006 13:38:56 +0000 (+0000) Subject: coding style X-Git-Tag: release-1.1.0~291 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c729cdba07a71fc68d25a793013f694dda8f24f;p=thirdparty%2Fldns.git coding style --- diff --git a/buffer.c b/buffer.c index 64b7a095..685c7b02 100644 --- a/buffer.c +++ b/buffer.c @@ -15,8 +15,7 @@ ldns_buffer * ldns_buffer_new(size_t capacity) { - ldns_buffer *buffer - = LDNS_MALLOC(ldns_buffer); + ldns_buffer *buffer = LDNS_MALLOC(ldns_buffer); if (!buffer) { return NULL; } @@ -106,6 +105,7 @@ ldns_buffer_reserve(ldns_buffer *buffer, size_t amount) assert(!buffer->_fixed); if (buffer->_capacity < buffer->_position + amount) { size_t new_capacity = buffer->_capacity * 3 / 2; + if (new_capacity < buffer->_position + amount) { new_capacity = buffer->_position + amount; } @@ -144,8 +144,7 @@ ldns_buffer_printf(ldns_buffer *buffer, const char *format, ...) } va_start(args, format); written = vsnprintf((char *) ldns_buffer_current(buffer), - ldns_buffer_remaining(buffer), - format, args); + ldns_buffer_remaining(buffer), format, args); va_end(args); if (written == -1) { buffer->_status = LDNS_STATUS_INTERNAL_ERR; diff --git a/compiletest.c b/compiletest.c index 7f8cde23..85b61caa 100644 --- a/compiletest.c +++ b/compiletest.c @@ -2,8 +2,11 @@ #include "ldns/config.h" #include -int main(void) { +int +main(void) +{ ldns_rr *rr = ldns_rr_new(); + ldns_rr_free(rr); return 0; } diff --git a/dname.c b/dname.c index 00048347..ef162a39 100644 --- a/dname.c +++ b/dname.c @@ -30,8 +30,7 @@ ldns_dname_cat_clone(const ldns_rdf *rd1, const ldns_rdf *rd2) uint8_t *buf; if (ldns_rdf_get_type(rd1) != LDNS_RDF_TYPE_DNAME || - ldns_rdf_get_type(rd2) != LDNS_RDF_TYPE_DNAME) - { + ldns_rdf_get_type(rd2) != LDNS_RDF_TYPE_DNAME) { return NULL; } @@ -44,8 +43,7 @@ ldns_dname_cat_clone(const ldns_rdf *rd1, const ldns_rdf *rd2) /* put the two dname's after each other */ memcpy(buf, ldns_rdf_data(rd1), ldns_rdf_size(rd1) - 1); - memcpy(buf + ldns_rdf_size(rd1) - 1, - ldns_rdf_data(rd2), ldns_rdf_size(rd2)); + memcpy(buf + ldns_rdf_size(rd1) - 1, ldns_rdf_data(rd2), ldns_rdf_size(rd2)); new = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_DNAME, new_size, buf); @@ -133,6 +131,7 @@ ldns_rdf * ldns_dname_new(uint16_t s, void *d) { ldns_rdf *rd; + rd = LDNS_MALLOC(ldns_rdf); if (!rd) { return NULL; @@ -182,8 +181,7 @@ ldns_dname_is_subdomain(const ldns_rdf *sub, const ldns_rdf *parent) if (ldns_rdf_get_type(sub) != LDNS_RDF_TYPE_DNAME || ldns_rdf_get_type(parent) != LDNS_RDF_TYPE_DNAME || - ldns_rdf_compare(sub, parent) == 0 - ) { + ldns_rdf_compare(sub, parent) == 0) { return false; }