ping patch

[Alain Magloire]

Index: ping.c
===================================================================
RCS file: /home/cvs/inetutils/ping/ping.c,v
retrieving revision 1.5
diff -w -u -p -r1.5 ping.c
--- ping.c      2001/06/18 15:55:02     1.5
+++ ping.c      2001/06/19 04:03:29
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GNU Inetutils.
 
@@ -101,8 +101,9 @@ int (*ping_type) __P((int argc, char **a
 
 static void show_usage (void);
 static void show_license (void);
-static void decode_pattern(char *text, int *pattern_len, u_char *pattern_data);
-static void decode_type(char *optarg);
+static void decode_pattern(const char *text, int *pattern_len,
+                          u_char *pattern_data);
+static void decode_type(const char *optarg_);
 static void init_data_buffer(u_char *pat, int len);
 
 int
@@ -274,7 +275,7 @@ init_data_buffer(u_char *pat, int len)
   
 
 void
-decode_type(char *optarg)
+decode_type(const char *optarg)
 {
   if (strcasecmp(optarg, "echo") == 0)
     ping_type = ping_echo;
@@ -294,7 +295,7 @@ decode_type(char *optarg)
 }
 
 void
-decode_pattern(char *text, int *pattern_len, u_char *pattern_data)
+decode_pattern(const char *text, int *pattern_len, u_char *pattern_data)
 {
   int i, c, off;
 
Index: ping_address.c
===================================================================
RCS file: /home/cvs/inetutils/ping/ping_address.c,v
retrieving revision 1.2
diff -w -u -p -r1.2 ping_address.c
--- ping_address.c      2001/06/18 15:55:02     1.2
+++ ping_address.c      2001/06/19 04:03:30
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GNU Inetutils.
 
@@ -125,4 +125,5 @@ print_address(int dupflag, void *closure
 int
 address_finish()
 {
+  return 0;
 }
Index: ping_echo.c
===================================================================
RCS file: /home/cvs/inetutils/ping/ping_echo.c,v
retrieving revision 1.2
diff -w -u -p -r1.2 ping_echo.c
--- ping_echo.c 2001/06/18 15:55:02     1.2
+++ ping_echo.c 2001/06/19 04:03:31
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GNU Inetutils.
 
@@ -60,7 +60,7 @@
 static int handler(int code, void *closure,
                   struct sockaddr_in *dest, struct sockaddr_in *from,
                   struct ip *ip, icmphdr_t *icmp, int datalen);
-int print_echo(int dup, struct ping_stat *stat, 
+static void print_echo(int dup, struct ping_stat *stat,
              struct sockaddr_in *dest, struct sockaddr_in *from,
              struct ip *ip, icmphdr_t *icmp, int datalen);
 static int echo_finish();
@@ -145,14 +145,15 @@ handler(int code, void *closure,
     case PEV_NOECHO:;
       print_icmp_header(from, ip, icmp, datalen);
     }
+  return 0;
 }
 
-int
+void
 print_echo(int dupflag, struct ping_stat *ping_stat, 
           struct sockaddr_in *dest, struct sockaddr_in *from,
           struct ip *ip, icmphdr_t *icmp, int datalen)
 {
-  int n, hlen;
+  int hlen;
   struct timeval tv;
   int timing = 0;
   double triptime = 0.0;
@@ -207,10 +208,9 @@ print_echo(int dupflag, struct ping_stat
   print_ip_opt(ip, hlen);
   printf("\n");
 
-  return 0;
 }
 
-char *
+static char *
 ipaddr2str(struct in_addr ina)
 {
   struct hostent *hp;
@@ -229,7 +229,7 @@ void
 print_icmp_header(struct sockaddr_in *from,
                  struct ip *ip, icmphdr_t *icmp, int len)
 {
-  int n, hlen;
+  int hlen;
   struct ip *orig_ip;
 
   /* Length of the IP header */
Index: ping_impl.h
===================================================================
RCS file: /home/cvs/inetutils/ping/ping_impl.h,v
retrieving revision 1.2
diff -w -u -p -r1.2 ping_impl.h
--- ping_impl.h 2001/06/18 15:55:02     1.2
+++ ping_impl.h 2001/06/19 04:03:31
@@ -28,5 +28,5 @@ extern unsigned long preload;
 extern u_char *data_buffer;
 extern size_t data_length;
 
-extern int ping_run(PING *ping, int (*finish)());
+extern int ping_run(PING *_ping, int (*_finish) __P((void)));
 extern int ping_finish(void);
Index: ping_timestamp.c
===================================================================
RCS file: /home/cvs/inetutils/ping/ping_timestamp.c,v
retrieving revision 1.2
diff -w -u -p -r1.2 ping_timestamp.c
--- ping_timestamp.c    2001/06/18 15:55:02     1.2
+++ ping_timestamp.c    2001/06/19 04:03:31
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001 Free Software Foundation, Inc.
 
    This file is part of GNU Inetutils.
 
@@ -55,7 +55,10 @@
 static int recv_timestamp(int code, void *closure,
                          struct sockaddr_in *dest, struct sockaddr_in *from,
                          struct ip *ip, icmphdr_t *icmp, int datalen);
-static int timestamp_finish();
+static int timestamp_finish(void);
+static void print_timestamp(int dupflag, void *closure,
+                           struct sockaddr_in *dest, struct sockaddr_in *from,
+                           struct ip *ip, icmphdr_t *icmp, int datalen);
 
 int
 ping_timestamp(int argc, char **argv)
@@ -94,10 +97,11 @@ recv_timestamp(int code, void *closure,
     case PEV_NOECHO:;
       print_icmp_header(from, ip, icmp, datalen);
     }
+  return 0;
 }
 
 
-void
+static void
 print_timestamp(int dupflag, void *closure,
                struct sockaddr_in *dest, struct sockaddr_in *from,
                struct ip *ip, icmphdr_t *icmp, int datalen)