[src/trunk]: src/external/bsd/tcpdump/dist PR/45841: Henning Petersen: One si...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0955b2800478
branches:  trunk
changeset: 772787:0955b2800478
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 16 17:34:18 2012 +0000

description:
PR/45841: Henning Petersen: One sizeof is enough.

diffstat:

 external/bsd/tcpdump/dist/print-eigrp.c   |  6 +++---
 external/bsd/tcpdump/dist/print-ldp.c     |  4 ++--
 external/bsd/tcpdump/dist/print-lmp.c     |  4 ++--
 external/bsd/tcpdump/dist/print-lspping.c |  4 ++--
 external/bsd/tcpdump/dist/print-rsvp.c    |  4 ++--
 external/bsd/tcpdump/dist/print-slow.c    |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diffs (144 lines):

diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-eigrp.c
--- a/external/bsd/tcpdump/dist/print-eigrp.c   Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-eigrp.c   Mon Jan 16 17:34:18 2012 +0000
@@ -20,7 +20,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-eigrp.c,v 1.7 2005-05-06 02:53:26 guy Exp";
 #else
-__RCSID("$NetBSD: print-eigrp.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-eigrp.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -285,7 +285,7 @@
 
         if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header) ||
             eigrp_tlv_len > tlen) {
-            print_unknown_data(tptr+sizeof(sizeof(struct eigrp_tlv_header)),"\n\t    ",tlen);
+            print_unknown_data(tptr+sizeof(struct eigrp_tlv_header),"\n\t    ",tlen);
             return;
         }
 
@@ -473,7 +473,7 @@
         }
         /* do we want to see an additionally hexdump ? */
         if (vflag > 1)
-            print_unknown_data(tptr+sizeof(sizeof(struct eigrp_tlv_header)),"\n\t    ",
+            print_unknown_data(tptr+sizeof(struct eigrp_tlv_header),"\n\t    ",
                                eigrp_tlv_len-sizeof(struct eigrp_tlv_header));
 
         tptr+=eigrp_tlv_len;
diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-ldp.c
--- a/external/bsd/tcpdump/dist/print-ldp.c     Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-ldp.c     Mon Jan 16 17:34:18 2012 +0000
@@ -20,7 +20,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-ldp.c,v 1.20 2006-06-23 02:03:09 hannes Exp";
 #else
-__RCSID("$NetBSD: print-ldp.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-ldp.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -614,7 +614,7 @@
         }
         /* do we want to see an additionally hexdump ? */
         if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct ldp_msg_header)),"\n\t  ",
+            print_unknown_data(tptr+sizeof(struct ldp_msg_header),"\n\t  ",
                                msg_len);
 
         tptr += msg_len+4;
diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-lmp.c
--- a/external/bsd/tcpdump/dist/print-lmp.c     Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-lmp.c     Mon Jan 16 17:34:18 2012 +0000
@@ -23,7 +23,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.11 2007-08-02 17:32:49 hannes Exp";
 #else
-__RCSID("$NetBSD: print-lmp.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-lmp.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -876,7 +876,7 @@
         }
         /* do we want to see an additionally hexdump ? */
         if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct lmp_object_header)),"\n\t    ",
+            print_unknown_data(tptr+sizeof(struct lmp_object_header),"\n\t    ",
                                lmp_obj_len-sizeof(struct lmp_object_header));
 
         tptr+=lmp_obj_len;
diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-lspping.c
--- a/external/bsd/tcpdump/dist/print-lspping.c Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-lspping.c Mon Jan 16 17:34:18 2012 +0000
@@ -19,7 +19,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-lspping.c,v 1.20 2008-01-28 14:20:43 hannes Exp";
 #else
-__RCSID("$NetBSD: print-lspping.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-lspping.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -883,7 +883,7 @@
         }
         /* do we want to see an additionally tlv hexdump ? */
         if (vflag > 1 || tlv_hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct lspping_tlv_header)),"\n\t    ",
+            print_unknown_data(tptr+sizeof(struct lspping_tlv_header),"\n\t    ",
                                lspping_tlv_len);
 
 
diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-rsvp.c
--- a/external/bsd/tcpdump/dist/print-rsvp.c    Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-rsvp.c    Mon Jan 16 17:34:18 2012 +0000
@@ -21,7 +21,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-rsvp.c,v 1.50 2008-08-16 11:36:20 hannes Exp";
 #else
-__RCSID("$NetBSD: print-rsvp.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-rsvp.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -1795,7 +1795,7 @@
         }
         /* do we also want to see a hex dump ? */
         if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct rsvp_object_header)),"\n\t    ", /* FIXME indentation */
+            print_unknown_data(tptr+sizeof(struct rsvp_object_header),"\n\t    ", /* FIXME indentation */
                                rsvp_obj_len-sizeof(struct rsvp_object_header));
 
         tptr+=rsvp_obj_len;
diff -r 92e9184eb3c6 -r 0955b2800478 external/bsd/tcpdump/dist/print-slow.c
--- a/external/bsd/tcpdump/dist/print-slow.c    Mon Jan 16 16:27:59 2012 +0000
+++ b/external/bsd/tcpdump/dist/print-slow.c    Mon Jan 16 17:34:18 2012 +0000
@@ -24,7 +24,7 @@
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-slow.c,v 1.8 2006-10-12 05:44:33 hannes Exp";
 #else
-__RCSID("$NetBSD: print-slow.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+__RCSID("$NetBSD: print-slow.c,v 1.3 2012/01/16 17:34:18 christos Exp $");
 #endif
 #endif
 
@@ -373,7 +373,7 @@
             tlv_header->type != LACP_TLV_TERMINATOR &&
             tlv_header->type != MARKER_TLV_TERMINATOR) {
             printf("\n\t-----trailing data-----");
-            print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t  ",tlen);
+            print_unknown_data(tptr+sizeof(struct tlv_header_t),"\n\t  ",tlen);
             return;
         }
 
@@ -446,7 +446,7 @@
         }
         /* do we want to see an additional hexdump ? */
         if (vflag > 1) {
-            print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t  ",
+            print_unknown_data(tptr+sizeof(struct tlv_header_t),"\n\t  ",
                                tlv_len-sizeof(struct tlv_header_t));
         }