massive commenting/autoconf changes

[netatalk.git] / bin / aecho / aecho.c

diff --git a/bin/aecho/aecho.c b/bin/aecho/aecho.c
index dc88e31bd183548399825dc14c0c7c1382a874cf..0bf9d4d5ec281811c762194c2314319b80c2c5a0 100644 (file)
--- a/bin/aecho/aecho.c
+++ b/bin/aecho/aecho.c
@@ -1,4 +1,6 @@
 /*
+ * $Id: aecho.c,v 1.4 2001-06-29 14:14:46 rufustfirefly Exp $
+ *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -25,6 +27,10 @@
  * AppleTalk Echo Protocol Client
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -33,8 +39,11 @@
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif /* HAVE_NETDB_H */
 
 #include <netatalk/endian.h>
 #include <netatalk/at.h>
@@ -43,21 +52,21 @@
 #include <atalk/nbp.h>
 #include <atalk/netddp.h>
 #include <atalk/ddp.h>
+#include <atalk/util.h>
 
 /* FIXME/SOCKLEN_T: socklen_t is a unix98 feature */
 #ifndef SOCKLEN_T
 #define SOCKLEN_T unsigned int
-#endif
+#endif /* ! SOCKLEN_T */
 
 struct sockaddr_at     target;
 int                    s, nsent = 0, nrecv = 0;
 time_t                 totalms = 0, minms = -1, maxms = -1;
 static unsigned int     pings = 0;
 
-#if !defined( ibm032 ) && !defined( _IBMR2 )
-    void
-#endif ibm032 _IBMR2
-done()
+void usage(char *);
+
+void done()
 {
     if ( nsent > 0 ) {
        printf( "\n----%d.%d AEP Statistics----\n",
@@ -65,17 +74,14 @@ done()
        printf( "%d packets sent, %d packets received, %d%% packet loss\n",
                nsent, nrecv, (( nsent - nrecv ) * 100 ) / nsent );
        if ( nrecv > 0 ) {
-           printf( "round-trip (ms)  min/avg/max = %d/%d/%d\n",
+           printf( "round-trip (ms)  min/avg/max = %ld/%ld/%ld\n",
                    minms, totalms / nrecv, maxms );
        }       
     }
     exit( 0 );
 }
   
-#if !defined( ibm032 ) && !defined( _IBMR2 )
-    void
-#endif ibm032 _IBMR2
-aep_send()
+void aep_send()
 {
     struct timeval     tv;
     char               *p, buf[ 1024 ];
@@ -104,7 +110,7 @@ aep_send()
     if (pings && nsent > pings) done();
 }
 
-main( ac, av )
+int main( ac, av )
     int                ac;
     char       **av;
 {
@@ -159,7 +165,7 @@ main( ac, av )
     memset( &target, 0, sizeof( struct sockaddr_at ));
 #ifdef BSD4_4
     target.sat_len = sizeof( struct sockaddr_at );
-#endif BSD4_4
+#endif /* BSD4_4 */
     target.sat_family = AF_APPLETALK;
     if ( !atalk_aton( av[ optind ], &target.sat_addr )) {
        if ( nbp_name( av[ optind ], &obj, &type, &zone ) || !obj ) {
@@ -243,14 +249,14 @@ main( ac, av )
        if ( ms < minms || minms == -1 ) {
            minms = ms;
        }
-       printf( "%d bytes from %u.%u: aep_seq=%d. time=%d. ms\n",
+       printf( "%d bytes from %u.%u: aep_seq=%d. time=%ld. ms\n",
                cc, ntohs( sat.sat_addr.s_net ), sat.sat_addr.s_node,
                seq, ms );
         if (pings && seq + 1 >= pings) done();
     }
 }
 
-usage( av0 )
+void usage( char * av0 )
 {
     fprintf( stderr, "usage:\t%s [-A source address ] [-c count] ( addr | nbpname )\n", av0 );
     exit( 1 );