From: Tinderbox User Date: Tue, 26 Mar 2013 23:47:51 +0000 (+0000) Subject: update copyright notice X-Git-Tag: v9.10.0a1~448^2~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a00c3eb03464988821a0b6817b63ddb3c090890;p=thirdparty%2Fbind9.git update copyright notice --- diff --git a/Makefile.in b/Makefile.in index 252014885c3..309d8b3a561 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2009, 2011-2013 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2002 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c index 38227c5e1ee..de4ee52c813 100644 --- a/lib/isc/unix/net.c +++ b/lib/isc/unix/net.c @@ -456,33 +456,33 @@ cmsg_space(ISC_SOCKADDR_LEN_T len) { */ static isc_result_t make_nonblock(int fd) { - int ret; - int flags; - char strbuf[ISC_STRERRORSIZE]; + int ret; + int flags; + char strbuf[ISC_STRERRORSIZE]; #ifdef USE_FIONBIO_IOCTL - int on = 1; + int on = 1; - ret = ioctl(fd, FIONBIO, (char *)&on); + ret = ioctl(fd, FIONBIO, (char *)&on); #else - flags = fcntl(fd, F_GETFL, 0); - flags |= PORT_NONBLOCK; - ret = fcntl(fd, F_SETFL, flags); + flags = fcntl(fd, F_GETFL, 0); + flags |= PORT_NONBLOCK; + ret = fcntl(fd, F_SETFL, flags); #endif - if (ret == -1) { - isc__strerror(errno, strbuf, sizeof(strbuf)); - UNEXPECTED_ERROR(__FILE__, __LINE__, + if (ret == -1) { + isc__strerror(errno, strbuf, sizeof(strbuf)); + UNEXPECTED_ERROR(__FILE__, __LINE__, #ifdef USE_FIONBIO_IOCTL - "ioctl(%d, FIONBIO, &on): %s", fd, + "ioctl(%d, FIONBIO, &on): %s", fd, #else - "fcntl(%d, F_SETFL, %d): %s", fd, flags, + "fcntl(%d, F_SETFL, %d): %s", fd, flags, #endif - strbuf); + strbuf); - return (ISC_R_UNEXPECTED); - } + return (ISC_R_UNEXPECTED); + } - return (ISC_R_SUCCESS); + return (ISC_R_SUCCESS); } static isc_boolean_t