more compilation cleanup.

diff --git a/etc/afpd/appl.c b/etc/afpd/appl.c
index ababedf3f20557f070f706fb06f73b12b5982a75..fe4c4909fd8a56ac23b0e85c690d71aa5ae21691 100644 (file)
--- a/etc/afpd/appl.c
+++ b/etc/afpd/appl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: appl.c,v 1.12.2.1.2.1 2004-02-13 22:32:17 didg Exp $
+ * $Id: appl.c,v 1.12.2.1.2.2 2004-02-20 21:22:57 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -13,19 +13,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#include <sys/stat.h>
+
 #include <sys/param.h>
 #include <atalk/logger.h>
 #include <errno.h>
 
-#include <netatalk/endian.h>
 #include <atalk/adouble.h>
 #include <atalk/afp.h>
 

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index 207061e0cd2a653ddbdc928da1282d2e991edbb7..4a3a1ef23932e9b6812951e71abf0e0f2f3a8a62 100644 (file)
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <errno.h>
-#include <unistd.h>
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
@@ -42,12 +41,9 @@
 #endif /* ! HAVE_MEMCPY */
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <netinet/in.h>
 
-#include <netatalk/endian.h>
 #include <atalk/afp.h>
 #include <atalk/adouble.h>
 #include <atalk/logger.h>

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index 957c677abd1bb588e2c851fa7c98c6cdc566f450..003c853f4b8fae5b4d14ce93e5eb0aeb2fe77182 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.c,v 1.26.2.4.2.7 2004-01-10 06:40:58 didg Exp $
+ * $Id: desktop.c,v 1.26.2.4.2.8 2004-02-20 21:22:57 didg Exp $
  *
  * See COPYRIGHT.
  *
@@ -16,19 +16,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+
 #include <errno.h>
 #include <dirent.h>
-#include <sys/types.h>
-#include <sys/time.h>
+
 #include <sys/uio.h>
 #include <sys/param.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
 #include <netatalk/at.h>
 #include <netatalk/endian.h>

diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c
index ffa896ff45bd49d2d4036b6a9fded6e380ae9b8a..b6b0797e050068e4a73f2a607fd50f63d915c433 100644 (file)
--- a/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@ -1,5 +1,5 @@
 /*
- * $Id: directory.c,v 1.71.2.4.2.9 2004-02-13 22:32:18 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.10 2004-02-20 21:22:57 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -32,19 +32,14 @@ char *strchr (), *strrchr ();
 #include <stdio.h>
 #include <stdlib.h>
 #include <dirent.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+
 #include <grp.h>
 #include <pwd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/param.h>
 #include <errno.h>
 #include <utime.h>
-#include <netatalk/endian.h>
 #include <atalk/adouble.h>
+
 #include <atalk/afp.h>
 #include <atalk/util.h>
 #include <atalk/cnid.h>

diff --git a/etc/afpd/enumerate.c b/etc/afpd/enumerate.c
index 8fd284ce4fe6d9d0a07602f581aada63f447d80b..b7a7b376818cbffe3aebb55c00afd2f749c3850c 100644 (file)
--- a/etc/afpd/enumerate.c
+++ b/etc/afpd/enumerate.c
@@ -1,5 +1,5 @@
 /*
- * $Id: enumerate.c,v 1.39.2.2.2.2 2004-01-02 17:20:57 lenneis Exp $
+ * $Id: enumerate.c,v 1.39.2.2.2.3 2004-02-20 21:22:58 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -15,12 +15,9 @@
 #include <errno.h>
 
 #include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/param.h>
 
-#include <netatalk/endian.h>
 #include <atalk/afp.h>
 #include <atalk/adouble.h>
 #include <atalk/cnid.h>

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index dd6fde42eb73313ac8daa68eed21997c35aa0725..db3053b479977b949aceec5280a2b400fca5cc96 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.92.2.2.2.13 2004-02-10 02:40:33 didg Exp $
+ * $Id: file.c,v 1.92.2.2.2.14 2004-02-20 21:22:58 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -11,9 +11,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 
 /* STDC check */
 #if STDC_HEADERS
@@ -24,6 +21,7 @@
 #define strrchr index
 #endif /* HAVE_STRCHR */
 char *strchr (), *strrchr ();
+
 #ifndef HAVE_MEMCPY
 #define memcpy(d,s,n) bcopy ((s), (d), (n))
 #define memmove(d,s,n) bcopy ((s), (d), (n))
@@ -31,21 +29,14 @@ char *strchr (), *strrchr ();
 #endif /* STDC_HEADERS */
 
 #include <utime.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <dirent.h>
-#include <sys/mman.h>
 #include <errno.h>
 
 #include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/param.h>
-#include <sys/stat.h>
 
-#include <netatalk/endian.h>
 #include <atalk/adouble.h>
+
 #include <atalk/afp.h>
 #include <atalk/util.h>
 #include <atalk/cnid.h>

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index 4838bee2e75d70e0417c0744987f33d3d527dfa2..5f43b98d2756d8dd03dc32879faf6f63563b7e97 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: filedir.c,v 1.45.2.2.2.6 2004-02-13 22:32:18 didg Exp $
+ * $Id: filedir.c,v 1.45.2.2.2.7 2004-02-20 21:23:13 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -25,22 +25,15 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #include <dirent.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
-#include <netatalk/endian.h>
 #include <atalk/adouble.h>
+
 #include <atalk/afp.h>
 #include <atalk/util.h>
 #include <atalk/cnid.h>

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index 7ad3111734b2ec583b222634156a13d27f0c783c..d569d66e2c81d8daa693d5287ec6fbd84d6f25bc 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.c,v 1.51.2.2.2.5 2004-02-10 10:21:35 didg Exp $
+ * $Id: fork.c,v 1.51.2.2.2.6 2004-02-20 21:23:13 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -10,31 +10,24 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
+
 #include <dirent.h>
 #include <string.h>
 #include <errno.h>
+
+#include <atalk/adouble.h>
 #include <atalk/logger.h>
 
 #include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 
-#include <netatalk/endian.h>
 #include <netatalk/at.h>
 
 #include <atalk/dsi.h>
 #include <atalk/atp.h>
 #include <atalk/asp.h>
 #include <atalk/afp.h>
-#include <atalk/adouble.h>
+
 #include <atalk/util.h>
 #include <atalk/cnid.h>
 

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 1bdfd892f6b57239909f7827dac5e68fe27afeb3..18f70eccb314aaa9e3416c2e37028b12be94e55e 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.20.4.2.2.5 2003-11-14 14:37:38 didg Exp $
+ * $Id: main.c,v 1.20.4.2.2.6 2004-02-20 21:23:13 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,16 +12,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <signal.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <atalk/logger.h>
@@ -30,14 +22,14 @@
 
 #include <errno.h>
 
-#include <netatalk/endian.h>
+#include <atalk/adouble.h>
+
 #include <netatalk/at.h>
 #include <atalk/compat.h>
 #include <atalk/dsi.h>
 #include <atalk/atp.h>
 #include <atalk/asp.h>
 #include <atalk/afp.h>
-#include <atalk/adouble.h>
 #include <atalk/paths.h>
 #include <atalk/util.h>
 #include <atalk/server_child.h>
@@ -318,8 +310,9 @@ char        **av;
         for (config = configs; config; config = config->next) {
             if (config->fd < 0)
                 continue;
-            if (FD_ISSET(config->fd, &rfds))
+            if (FD_ISSET(config->fd, &rfds)) {
                 config->server_start(config, configs, server_children);
+            }
         }
     }
 

diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c
index 1a63214f8b097f3974d3f56fb1551fcc31d40166..50bccc0a5704fd193c56c0ad69875d198e8bf6d0 100644 (file)
--- a/etc/afpd/unix.c
+++ b/etc/afpd/unix.c
@@ -1,5 +1,5 @@
 /*
- * $Id: unix.c,v 1.43.2.1.2.2 2004-02-11 06:27:25 didg Exp $
+ * $Id: unix.c,v 1.43.2.1.2.3 2004-02-20 21:23:13 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -11,34 +11,32 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+
 /* STDC check */
 #ifdef STDC_HEADERS
 #include <string.h>
 #else /* STDC_HEADERS */
+
 #ifndef HAVE_STRCHR
 #define strchr index
 #define strrchr index
 #endif /* HAVE_STRCHR */
 char *strchr (), *strrchr ();
+
 #ifndef HAVE_MEMCPY
 #define memcpy(d,s,n) bcopy ((s), (d), (n))
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
+
 #include <errno.h>
 #include <dirent.h>
 #include <limits.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <sys/types.h>
 #include <sys/param.h>
-#include <sys/stat.h>
-#include <netatalk/endian.h>
 #include <atalk/logger.h>
 #include <atalk/adouble.h>
 #include <atalk/afp.h>
+
 #include "auth.h"
 #include "directory.h"
 #include "volume.h"

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index f8e3f78a3fe2b46c91d9bfc10a20b96c1c0c2800..c00d719e5a60ab88ed1966288ba1c038f74182d1 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.51.2.7.2.20 2004-02-14 15:47:20 didg Exp $
+ * $Id: volume.c,v 1.51.2.7.2.21 2004-02-20 21:23:13 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -17,9 +17,6 @@
 #include <grp.h>
 #include <utime.h>
 #include <errno.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
@@ -37,14 +34,10 @@ char *strchr (), *strrchr ();
 #define memmove(d,s,n) bcopy ((s), (d), (n))
 #endif /* ! HAVE_MEMCPY */
 #endif /* STDC_HEADERS */
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <netatalk/endian.h>
 #include <atalk/asp.h>
 #include <atalk/dsi.h>
 #include <atalk/adouble.h>