BIND 10 trac805-merged, updated. 526b0b5b5615cd258335b14c6417ee26f0d671f5 [805] fixed a build issue with clang: it doesn't accept the default parameter value identical to the parameter name itself.

[BIND 10 source code commits]

The branch, trac805-merged has been updated
       via  526b0b5b5615cd258335b14c6417ee26f0d671f5 (commit)
      from  ca3cc561237dde1fac32c592056051eb339bea03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 526b0b5b5615cd258335b14c6417ee26f0d671f5
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jan 6 11:16:38 2012 -0800

    [805] fixed a build issue with clang: it doesn't accept the default parameter
    value identical to the parameter name itself.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/sockcreator/sockcreator.cc |    6 +++---
 src/bin/sockcreator/sockcreator.h  |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/sockcreator/sockcreator.cc b/src/bin/sockcreator/sockcreator.cc
index 523cbfb..4a64790 100644
--- a/src/bin/sockcreator/sockcreator.cc
+++ b/src/bin/sockcreator/sockcreator.cc
@@ -70,7 +70,7 @@ get_sock(const int type, struct sockaddr *bind_addr, const socklen_t addr_len)
 
 int
 run(const int input_fd, const int output_fd, const get_sock_t get_sock,
-    const send_fd_t send_fd, const close_t close)
+    const send_fd_t send_fd_fun, const close_t close_fun)
 {
     for (;;) {
         // Read the command
@@ -131,11 +131,11 @@ run(const int input_fd, const int output_fd, const get_sock_t get_sock,
                 if (result >= 0) { // We got the socket
                     WRITE("S", 1);
                     // FIXME: Check the output and write a test for it
-                    if(send_fd(output_fd, result) == FD_SYSTEM_ERROR) {
+                    if (send_fd_fun(output_fd, result) == FD_SYSTEM_ERROR) {
                         return 3;
                     }
                     // Don't leak the socket
-                    if (close(result) == -1) {
+                    if (close_fun(result) == -1) {
                         return 4;
                     }
                 } else {
diff --git a/src/bin/sockcreator/sockcreator.h b/src/bin/sockcreator/sockcreator.h
index bbac27a..216e486 100644
--- a/src/bin/sockcreator/sockcreator.h
+++ b/src/bin/sockcreator/sockcreator.h
@@ -94,14 +94,14 @@ int
  * \param send_fd_fun The function that is used to send the socket over
  *     a file descriptor. This should be left on the default value, it is
  *     here for testing purposes.
- * \param close The close function used to close sockets, coming from
+ * \param close_fun The close function used to close sockets, coming from
  *     unistd.h. It can be overriden in tests.
  */
 int
 run(const int input_fd, const int output_fd,
     const get_sock_t get_sock_fun = get_sock,
     const send_fd_t send_fd_fun = isc::util::io::send_fd,
-    const close_t close = close);
+    const close_t close_fun = close);
 
 } // End of the namespaces
 }