Merging in final change from rt15937, getting rid of space

before () in function calls.

diff --git a/client/dhclient.c b/client/dhclient.c
index 3d2aebb358b0e4d71d86b95e9cf9c06a31ac2e53..8485364f333668ed6c59b8495d35396cf0845a90 100644 (file)
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.136 2006/05/05 20:32:30 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.137 2006/05/11 14:48:58 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -106,15 +106,15 @@ int main (argc, argv, envp)
         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
            open a file the lowest available file decriptor is used. */
-        fd = open ("/dev/null", O_RDWR);
+        fd = open("/dev/null", O_RDWR);
         if (fd == 0)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 1)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 2)
                 log_perror = 0; /* No sense logging to /dev/null. */
         else if (fd != -1)
-                close (fd);
+                close(fd);
 
 #ifdef SYSLOG_4_2
        openlog ("dhclient", LOG_NDELAY);
@@ -2731,9 +2731,9 @@ void go_daemon ()
         close(2);
 
        /* Reopen them on /dev/null. */
-       open ("/dev/null", O_RDWR);
-       open ("/dev/null", O_RDWR);
-       open ("/dev/null", O_RDWR);
+       open("/dev/null", O_RDWR);
+       open("/dev/null", O_RDWR);
+       open("/dev/null", O_RDWR);
        log_perror = 0; /* No sense logging to /dev/null. */
 
        write_client_pid_file ();

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index c85758e2905f6950cc1a3a6e05bf8b40f19007d1..859fcf0f6c7ee5e70a9e5b20b21f640229893b92 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcrelay.c,v 1.57 2006/05/05 20:32:30 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: dhcrelay.c,v 1.58 2006/05/11 14:48:59 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -114,15 +114,15 @@ int main (argc, argv, envp)
         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
            open a file the lowest available file decriptor is used. */
-        fd = open ("/dev/null", O_RDWR);
+        fd = open("/dev/null", O_RDWR);
         if (fd == 0)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 1)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 2)
                 log_perror = 0; /* No sense logging to /dev/null. */
         else if (fd != -1)
-                close (fd);
+                close(fd);
 
 #ifdef SYSLOG_4_2
        openlog ("dhcrelay", LOG_NDELAY);

diff --git a/server/dhcpd.c b/server/dhcpd.c
index eb1c669e109f46ac16db8b465a1297a8b42d6224..4570cb8ffe33fd60a0bfc631e46f80bb04896734 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.119 2006/05/05 20:32:30 dhankins Exp $ Copyright 2004-2006 Internet Systems Consortium.";
+"$Id: dhcpd.c,v 1.120 2006/05/11 14:48:59 shane Exp $ Copyright 2004-2006 Internet Systems Consortium.";
 #endif
 
   static char copyright[] =
@@ -230,15 +230,15 @@ int main (argc, argv, envp)
         /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
            2 (stderr) are open. To do this, we assume that when we
            open a file the lowest available file decriptor is used. */
-        fd = open ("/dev/null", O_RDWR);
+        fd = open("/dev/null", O_RDWR);
         if (fd == 0)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 1)
-                fd = open ("/dev/null", O_RDWR);
+                fd = open("/dev/null", O_RDWR);
         if (fd == 2)
                 log_perror = 0; /* No sense logging to /dev/null. */
         else if (fd != -1)
-                close (fd);
+                close(fd);
 
        /* Set up the client classification system. */
        classification_setup ();
@@ -573,17 +573,17 @@ int main (argc, argv, envp)
 
        if (daemon) {
                /* Become session leader and get pid... */
-               pid = setsid ();
+               pid = setsid();
 
                 /* Close standard I/O descriptors. */
-                close (0);
-                close (1);
-                close (2);
+                close(0);
+                close(1);
+                close(2);
 
                 /* Reopen them on /dev/null. */
-                open ("/dev/null", O_RDWR);
-                open ("/dev/null", O_RDWR);
-                open ("/dev/null", O_RDWR);
+                open("/dev/null", O_RDWR);
+                open("/dev/null", O_RDWR);
+                open("/dev/null", O_RDWR);
                 log_perror = 0; /* No sense logging to /dev/null. */
        }