Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index bc76448f00a8cfb3e5eb7f4da28be838c50119bb..89130a373c070e5855b48f35945acff8e04cba7e 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.17 2002-12-11 07:14:03 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.20 2003-11-19 00:36:08 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -48,7 +48,7 @@ struct ipcomp {
 #include "extract.h"
 
 int
 #include "extract.h"
 
 int

-ipcomp_print(register const u_char *bp, int *nhdr)
+ipcomp_print(register const u_char *bp, int *nhdr _U_)

 {
        register const struct ipcomp *ipcomp;
        register const u_char *ep;
 {
        register const struct ipcomp *ipcomp;
        register const u_char *ep;


@@ -87,7 +87,5 @@ ipcomp_print(register const u_char *bp, int *nhdr)
 
 #endif
 fail:
 
 #endif
 fail:

-       if (nhdr)
-               *nhdr = -1;
-       return 65536;
+       return -1;

 }
 }