From 16abe694c53df37db7484c572324b2cca32082b4 Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Fri, 8 Feb 2002 00:02:11 +0000
Subject: [PATCH] Trunk-BP: includes cleanup.

---
 libatalk/asp/asp_getsess.c | 31 ++++++++++++++++---------------
 libatalk/nbp/nbp_lkup.c    |  8 +++++---
 libatalk/nbp/nbp_rgstr.c   |  7 ++++---
 libatalk/nbp/nbp_unrgstr.c |  8 +++++---
 libatalk/nbp/nbp_util.c    | 12 +++++++-----
 5 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/libatalk/asp/asp_getsess.c b/libatalk/asp/asp_getsess.c
index 4c7765d5..fd303f37 100644
--- a/libatalk/asp/asp_getsess.c
+++ b/libatalk/asp/asp_getsess.c
@@ -1,5 +1,5 @@
 /*
- * $Id: asp_getsess.c,v 1.4 2001-09-06 19:04:40 rufustfirefly Exp $
+ * $Id: asp_getsess.c,v 1.4.2.1 2002-02-08 00:02:11 srittau Exp $
  *
  * Copyright (c) 1990,1996 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -12,38 +12,39 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
+#include <signal.h>
+#include <syslog.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
-#include <syslog.h>
-#include <errno.h>
-#include <sys/signal.h>
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/uio.h>
-
-/* POSIX.1 sys/wait.h check */
-#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/param.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif /* HAVE_SYS_WAIT_H */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif /* ! WEXITSTATUS */
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif /* ! WIFEXITED */
 
-#include <sys/socket.h>
-#include <sys/param.h>
 #include <netatalk/at.h>
 #include <atalk/compat.h>
 #include <atalk/atp.h>
 #include <atalk/asp.h>
 
 #include <atalk/server_child.h>
+
 #include "asp_child.h"
 
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif /* ! WEXITSTATUS */
+#ifndef WIFEXITED
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif /* ! WIFEXITED */
+
 static ASP server_asp;
 static struct server_child *children = NULL;
 static struct asp_child    **asp_ac = NULL;
diff --git a/libatalk/nbp/nbp_lkup.c b/libatalk/nbp/nbp_lkup.c
index 9a321274..6db07367 100644
--- a/libatalk/nbp/nbp_lkup.c
+++ b/libatalk/nbp/nbp_lkup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp_lkup.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: nbp_lkup.c,v 1.3.2.1 2002-02-08 00:04:49 srittau Exp $
  *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -10,11 +10,14 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
+#include <errno.h>
+#include <signal.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
+
 #include <netatalk/endian.h>
 #include <netatalk/at.h>
 #include <netatalk/ddp.h>
@@ -26,7 +29,6 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
-#include <errno.h>
 
 #include  "nbp_conf.h"
 
diff --git a/libatalk/nbp/nbp_rgstr.c b/libatalk/nbp/nbp_rgstr.c
index 5fa02492..098a3eb6 100644
--- a/libatalk/nbp/nbp_rgstr.c
+++ b/libatalk/nbp/nbp_rgstr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp_rgstr.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: nbp_rgstr.c,v 1.3.2.1 2002-02-08 00:04:49 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -10,12 +10,13 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
+#include <errno.h>
+#include <signal.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
-#include <errno.h>
 
 #include <netatalk/at.h>
 #include <netatalk/endian.h>
diff --git a/libatalk/nbp/nbp_unrgstr.c b/libatalk/nbp/nbp_unrgstr.c
index f7b0ccff..35fb80f9 100644
--- a/libatalk/nbp/nbp_unrgstr.c
+++ b/libatalk/nbp/nbp_unrgstr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp_unrgstr.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: nbp_unrgstr.c,v 1.3.2.1 2002-02-08 00:04:49 srittau Exp $
  *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -10,12 +10,14 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
+#include <errno.h>
+#include <signal.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
-#include <errno.h>
+
 #include <netatalk/endian.h>
 #include <netatalk/at.h>
 #include <atalk/nbp.h>
diff --git a/libatalk/nbp/nbp_util.c b/libatalk/nbp/nbp_util.c
index 6ff8c41a..42280d0f 100644
--- a/libatalk/nbp/nbp_util.c
+++ b/libatalk/nbp/nbp_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp_util.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: nbp_util.c,v 1.3.2.1 2002-02-08 00:04:49 srittau Exp $
  *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -10,13 +10,11 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif /* HAVE_NETDB_H */
+#include <signal.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
 
 #include <netatalk/endian.h>
@@ -26,6 +24,10 @@
 #include <atalk/ddp.h>
 #include <atalk/util.h>
 
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif /* HAVE_NETDB_H */
+
 #include  "nbp_conf.h"
 
 char		nbp_send[ 1024 ];
-- 
2.39.2