Add changes in 4.2.1.

[tcpdump] / print-ipcomp.c

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 53c913c09df69f12799f53564bbe365fbf856e6f..89130a373c070e5855b48f35945acff8e04cba7e 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -19,6 +19,10 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#ifndef lint
+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
 #include "config.h"
@@ -43,12 +47,8 @@ struct ipcomp {
 #include "addrtoname.h"
 #include "extract.h"
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipcomp.c,v 1.18 2003-11-15 00:39:28 guy Exp $";
-#endif
 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;
@@ -87,7 +87,5 @@ ipcomp_print(register const u_char *bp, int *nhdr)
 
 #endif
 fail:
-       if (nhdr)
-               *nhdr = -1;
-       return 65536;
+       return -1;
 }