Remove bdb env on exit

[netatalk.git] / libatalk / nbp / nbp_lkup.c

diff --git a/libatalk/nbp/nbp_lkup.c b/libatalk/nbp/nbp_lkup.c
index a6290e850a43375311e40db92c603eb275d496f9..6a991267f9b03aeb0e83f76fbb77150a713525e9 100644 (file)
--- a/libatalk/nbp/nbp_lkup.c
+++ b/libatalk/nbp/nbp_lkup.c
@@ -1,18 +1,23 @@
 /*
+ * $Id: nbp_lkup.c,v 1.5 2009-10-13 22:55:37 didg Exp $
+ *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#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>
@@ -21,21 +26,20 @@
 #include <atalk/netddp.h>
 #include <atalk/ddp.h>
 
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
-#include <errno.h>
+#endif /* HAVE_NETDB_H */
 
 #include  "nbp_conf.h"
 
 /* FIXME/SOCKLEN_T: socklen_t is a unix98 feature. */
 #ifndef SOCKLEN_T
 #define SOCKLEN_T unsigned int
-#endif
+#endif /* ! SOCKLEN_T */
 
-int nbp_lookup( obj, type, zone, nn, nncnt, ataddr )
-    const char         *obj, *type, *zone;
-    struct nbpnve      *nn;
-    int                        nncnt;
-    const struct at_addr *ataddr;
+int nbp_lookup( const char *obj, const char *type, const char *zone, struct nbpnve *nn,
+    int                        nncnt,
+    const struct at_addr *ataddr)
 {
     struct sockaddr_at addr, from;
     struct timeval     tv, tv_begin, tv_end;
@@ -58,9 +62,9 @@ int nbp_lookup( obj, type, zone, nn, nncnt, ataddr )
     *data++ = DDPTYPE_NBP;
 #ifdef MACOSX_SERVER
     nh.nh_op = from.sat_addr.s_node ? NBPOP_BRRQ : NBPOP_LKUP;
-#else
+#else /* MACOSX_SERVER */
     nh.nh_op = NBPOP_BRRQ;
-#endif
+#endif /* MACOSX_SERVER */
 
     nh.nh_cnt = 1;
     nh.nh_id = ++nbp_id;
@@ -120,7 +124,7 @@ int nbp_lookup( obj, type, zone, nn, nncnt, ataddr )
       addr.sat_addr.s_net = ATADDR_ANYNET;
       addr.sat_addr.s_node = ATADDR_BCAST;
     }
-#endif
+#endif /* MACOSX_SERVER */
     addr.sat_port = nbp_port;
 
     cnt = 0;