Browse Source

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

JINMEI Tatuya 13 years ago
parent
commit
526b0b5b56
2 changed files with 5 additions and 5 deletions
  1. 3 3
      src/bin/sockcreator/sockcreator.cc
  2. 2 2
      src/bin/sockcreator/sockcreator.h

+ 3 - 3
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 {

+ 2 - 2
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
 }