From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 3 Mar 2010 15:39:00 +0000 (+0000)
Subject:         - better casts in pipe code, brackets placed wrongly.
X-Git-Tag: release-1.4.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73dc792524aaa39e86a3ce0928ed77b19d2c1e4;p=thirdparty%2Funbound.git

    - better casts in pipe code, brackets placed wrongly.
        - iana portlist updated.


git-svn-id: file:///svn/unbound/trunk@2006 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 91faf8c3c..e7ef74843 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+3 March 2010: Wouter
+	- better casts in pipe code, brackets placed wrongly.
+	- iana portlist updated.
+
 1 March 2010: Wouter
 	- make install depends on make all.
 	- Fix 5011 auto-trust-anchor-file initial read to skip RRSIGs.
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index d2820126d..2002c0ba1 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -4064,6 +4064,7 @@
 5085,
 5092,
 5093,
+5094,
 5099,
 5100,
 5101,
diff --git a/util/tube.c b/util/tube.c
index 1bf557365..85822f9c9 100644
--- a/util/tube.c
+++ b/util/tube.c
@@ -298,7 +298,7 @@ int tube_write_msg(struct tube* tube, uint8_t* buf, uint32_t len,
 		return 0;
 	/* write remainder */
 	if(r != (ssize_t)sizeof(len)) {
-		if(write(fd, (char*)(&len)+r, sizeof(len)-r) == -1) {
+		if(write(fd, ((char*)&len)+r, sizeof(len)-r) == -1) {
 			log_err("tube msg write failed: %s", strerror(errno));
 			(void)fd_set_nonblock(fd);
 			return 0;
@@ -337,7 +337,7 @@ int tube_read_msg(struct tube* tube, uint8_t** buf, uint32_t* len,
 		return 0;
 	/* read remainder */
 	if(r != (ssize_t)sizeof(*len)) {
-		if((r=read(fd, (char*)(len)+r, sizeof(*len)-r)) == -1) {
+		if((r=read(fd, ((char*)len)+r, sizeof(*len)-r)) == -1) {
 			log_err("tube msg read failed: %s", strerror(errno));
 			(void)fd_set_nonblock(fd);
 			return 0;