Module Name: src
Committed By: christos
Date: Mon Jan 16 17:34:19 UTC 2012
Modified Files:
src/external/bsd/tcpdump/dist: print-eigrp.c print-ldp.c print-lmp.c
print-lspping.c print-rsvp.c print-slow.c
Log Message:
PR/45841: Henning Petersen: One sizeof is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tcpdump/dist/print-eigrp.c \
src/external/bsd/tcpdump/dist/print-ldp.c \
src/external/bsd/tcpdump/dist/print-lmp.c \
src/external/bsd/tcpdump/dist/print-lspping.c \
src/external/bsd/tcpdump/dist/print-rsvp.c \
src/external/bsd/tcpdump/dist/print-slow.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/dist/print-eigrp.c
diff -u src/external/bsd/tcpdump/dist/print-eigrp.c:1.2 src/external/bsd/tcpdump/dist/print-eigrp.c:1.3
--- src/external/bsd/tcpdump/dist/print-eigrp.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-eigrp.c Mon Jan 16 12:34:18 2012
@@ -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 @@ eigrp_print(register const u_char *pptr,
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 @@ eigrp_print(register const u_char *pptr,
}
/* 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;
Index: src/external/bsd/tcpdump/dist/print-ldp.c
diff -u src/external/bsd/tcpdump/dist/print-ldp.c:1.2 src/external/bsd/tcpdump/dist/print-ldp.c:1.3
--- src/external/bsd/tcpdump/dist/print-ldp.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-ldp.c Mon Jan 16 12:34:18 2012
@@ -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 @@ ldp_msg_print(register const u_char *ppt
}
/* 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;
Index: src/external/bsd/tcpdump/dist/print-lmp.c
diff -u src/external/bsd/tcpdump/dist/print-lmp.c:1.2 src/external/bsd/tcpdump/dist/print-lmp.c:1.3
--- src/external/bsd/tcpdump/dist/print-lmp.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-lmp.c Mon Jan 16 12:34:18 2012
@@ -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 @@ lmp_print(register const u_char *pptr, r
}
/* 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;
Index: src/external/bsd/tcpdump/dist/print-lspping.c
diff -u src/external/bsd/tcpdump/dist/print-lspping.c:1.2 src/external/bsd/tcpdump/dist/print-lspping.c:1.3
--- src/external/bsd/tcpdump/dist/print-lspping.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-lspping.c Mon Jan 16 12:34:18 2012
@@ -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 @@ lspping_print(register const u_char *ppt
}
/* 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);
Index: src/external/bsd/tcpdump/dist/print-rsvp.c
diff -u src/external/bsd/tcpdump/dist/print-rsvp.c:1.2 src/external/bsd/tcpdump/dist/print-rsvp.c:1.3
--- src/external/bsd/tcpdump/dist/print-rsvp.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-rsvp.c Mon Jan 16 12:34:18 2012
@@ -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 @@ _U_
}
/* 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;
Index: src/external/bsd/tcpdump/dist/print-slow.c
diff -u src/external/bsd/tcpdump/dist/print-slow.c:1.2 src/external/bsd/tcpdump/dist/print-slow.c:1.3
--- src/external/bsd/tcpdump/dist/print-slow.c:1.2 Sun Dec 5 00:11:30 2010
+++ src/external/bsd/tcpdump/dist/print-slow.c Mon Jan 16 12:34:18 2012
@@ -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 @@ void slow_marker_lacp_print(register con
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 @@ void slow_marker_lacp_print(register con
}
/* 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));
}
