Prototype lcp_print(); eliminate unused caplen variable

Remove extra argument to printf.

diff --git a/interface.h b/interface.h
index 7238c6e442b93ce5c96269a9d9ab497a0cc7118f..a7a0661e8d99ff028352e5817bb90ce2bb6d9579 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.115 1999-12-15 06:58:49 fenner Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.116 1999-12-15 07:55:42 fenner Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -239,6 +239,7 @@ extern void nbt_udp138_print(u_char *data, int);
 extern char *smb_errstr(int, int);
 extern void print_data(unsigned char *, int);
 extern void l2tp_print(const u_char *, u_int);
+extern void lcp_print(const u_char *, u_int);
 
 #ifdef INET6
 extern void ip6_print(const u_char *, int);

diff --git a/print-lcp.c b/print-lcp.c
index 542bd89310bb8d9b8f6b441a30024e37e05c0eb9..6fc93b3c6e10ecaaa7e42febc782fa5c81a8a27c 100644 (file)
--- a/print-lcp.c
+++ b/print-lcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.2 1999-11-21 09:36:56 fenner Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.3 1999-12-15 07:55:42 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -126,7 +126,7 @@ static struct tok lcpchap2str[] = {
 };
 
 void
-lcp_print(register const u_char *bp, u_int length, u_int caplen)
+lcp_print(register const u_char *bp, u_int length)
 {
   u_short lcp_code, lcp_id, lcp_length;
   const u_char *lcp_data;
@@ -157,7 +157,7 @@ lcp_print(register const u_char *bp, u_int length, u_int caplen)
        lcpopt_type = p[0];
        lcpopt_length = p[1];
        p+=2;
-       printf(" <%s ",tok2str(lcpoption2str, "option-#%d", lcpopt_type), lcpopt_length);
+       printf(" <%s ",tok2str(lcpoption2str, "option-#%d", lcpopt_type));
        if (lcpopt_length)
          switch (lcpopt_type) {
          case LCP_MRU:
@@ -213,8 +213,7 @@ lcp_print(register const u_char *bp, u_int length, u_int caplen)
   case LCP_CODEREJ:
     if (snapend < lcp_data+4) return;
     printf(" ");
-    /* XXX What's caplen? (lcp_print doesn't use it so it doesn't matter here) */
-    lcp_print(lcp_data, (lcp_length+lcp_data > snapend ? snapend-lcp_data : lcp_length), 0);
+    lcp_print(lcp_data, (lcp_length+lcp_data > snapend ? snapend-lcp_data : lcp_length));
     break;
   case LCP_TERMREQ:
   case LCP_TERMACK: