diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-30 12:05:55 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-03-30 12:05:55 +0000 |
| commit | f13740d13df7585f62c2143512187aa4252fa781 (patch) | |
| tree | 0f45a30877f734f2563e1b796aa19251a2eef86d | |
| parent | 539bee3f515b13a9a55ce65c0c0593babc7c5048 (diff) | |
| download | s6-dns-f13740d13df7585f62c2143512187aa4252fa781.tar.xz | |
Cosmetic fix: make sure there's no double close() in s6dns_enginev2.0.0.3
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/libs6dns/s6dns_engine.c | 9 |
5 files changed, 14 insertions, 9 deletions
@@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 4.0 or later - - skalibs version 2.1.0.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.3.3.0 or later: http://skarnet.org/software/skalibs/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/doc/index.html b/doc/index.html index c08d41a..f4afaae 100644 --- a/doc/index.html +++ b/doc/index.html @@ -45,7 +45,7 @@ point in the future. <li> A POSIX-compliant system with a standard C development environment </li> <li> GNU make, version 4.0 or later </li> <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version -2.2.0.0 or later </li> +2.3.3.0 or later </li> </ul> <h3> Licensing </h3> @@ -58,7 +58,7 @@ point in the future. <h3> Download </h3> <ul> - <li> The current released version of s6-dns is <a href="s6-dns-2.0.0.2.tar.gz">2.0.0.2</a>. </li> + <li> The current released version of s6-dns is <a href="s6-dns-2.0.0.3.tar.gz">2.0.0.3</a>. </li> <li> Alternatively, you can checkout a copy of the s6-dns git repository: <pre> git clone git://git.skarnet.org/s6-dns </pre> </li> </ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index 0041b3b..2c94fce 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -17,6 +17,12 @@ <h1> What has changed in s6-dns </h1> +<h2> in 2.0.0.3 </h2> + +<ul> + <li> skalibs dependency bumped to 2.3.3.0. </li> +</ul> + <h2> in 2.0.0.2 </h2> <ul> diff --git a/package/info b/package/info index 813358c..e6f4a4d 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-dns -version=2.0.0.2 +version=2.0.0.3 category=web package_macro_name=S6_DNS diff --git a/src/libs6dns/s6dns_engine.c b/src/libs6dns/s6dns_engine.c index f795789..63d8dd6 100644 --- a/src/libs6dns/s6dns_engine.c +++ b/src/libs6dns/s6dns_engine.c @@ -162,7 +162,7 @@ static void prepare_next (s6dns_engine_t *dt, tain_t const *stamp, int istcp) { if (!error_isagain(errno)) { - fd_close(dt->fd) ; + fd_close(dt->fd) ; dt->fd = -1 ; dt->curserver++ ; if (s6dns_engine_prepare(dt, stamp, istcp)) errno = EAGAIN ; } @@ -223,7 +223,7 @@ static int s6dns_engine_read_udp (s6dns_engine_t *dt, tain_t const *stamp) s6dns_message_header_unpack(buf, &h) ; if (h.tc) { - fd_close(dt->fd) ; + fd_close(dt->fd) ; dt->fd = -1 ; dt->curserver = 0 ; dt->protostate = 0 ; if (s6dns_engine_prepare(dt, stamp, 1)) errno = EAGAIN ; @@ -298,8 +298,7 @@ void s6dns_engine_recycle (s6dns_engine_t *dt) if (dt->fd >= 0) { register int e = errno ; - fd_close(dt->fd) ; - dt->fd = -1 ; + fd_close(dt->fd) ; dt->fd = -1 ; errno = e ; } dt->status = ECONNABORTED ; @@ -313,7 +312,7 @@ int s6dns_engine_timeout (s6dns_engine_t *dt, tain_t const *stamp) else if (!tain_less(&dt->localdeadline, stamp)) return 0 ; else if (dt->flagwriting) goto yes ; else if (!dt->flagreading) return 0 ; - fd_close(dt->fd) ; + fd_close(dt->fd) ; dt->fd = -1 ; dt->curserver++ ; if (!s6dns_engine_prepare(dt, stamp, dt->flagtcp)) { |