diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-25 17:14:34 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-25 18:21:18 +0100 |
| commit | 575188b5bf4fc1c26a2766319fcb7ca57d393868 (patch) | |
| tree | 887096c16d0cbeddfe8f0339621d16fcfbca6294 /print-dhcp6.c | |
| parent | 39c8c55aa9ff84244cf558b9a957b78933babf0a (diff) | |
| download | tcpdump-575188b5bf4fc1c26a2766319fcb7ca57d393868.tar.gz | |
Use pointer expressions like in most similar cases
Diffstat (limited to 'print-dhcp6.c')
| -rw-r--r-- | print-dhcp6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-dhcp6.c b/print-dhcp6.c index e2caa58a..2894ea8d 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -370,7 +370,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp))); ND_PRINT((ndo, " pltime:%u vltime:%u", EXTRACT_BE_U_4(tp + 16), EXTRACT_BE_U_4(tp + 20))); @@ -560,7 +560,7 @@ dhcp6opt_print(netdissect_options *ndo, } tp = (const u_char *)(dh6o + 1); for (i = 0; i < optlen; i += 16) - ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[i]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + i))); ND_PRINT((ndo, ")")); break; case DH6OPT_SIP_SERVER_D: @@ -617,7 +617,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8])); + ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, tp + 9), tp[8])); ND_PRINT((ndo, " pltime:%u vltime:%u", EXTRACT_BE_U_4(tp), EXTRACT_BE_U_4(tp + 4))); @@ -668,7 +668,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " type_%u", dh6_lq_query_type)); break; } - ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[1]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + 1))); if (optlen > 17) { /* there are query-options */ dhcp6opt_print(ndo, tp + 17, tp + optlen); @@ -689,7 +689,7 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp = (const u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s ", ip6addr_string(ndo, &tp[0]))); + ND_PRINT((ndo, " %s ", ip6addr_string(ndo, tp))); /* * Print hex dump first 10 characters. */ @@ -718,7 +718,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?")); break; } - ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp))); break; case DH6OPT_NTP_SUBOPTION_SRV_FQDN: ND_PRINT((ndo, " ")); |