Skip to content

Commit e108fb2

Browse files
committed
ping: remove assignments of values that are never read
fixes iputils#2
1 parent b738a72 commit e108fb2

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

clockdiff.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ measure(struct sockaddr_in * addr)
133133
long delta1, delta2;
134134
struct timeval tv1, tout;
135135
unsigned char packet[PACKET_IN], opacket[64];
136-
struct icmphdr *icp = (struct icmphdr *) packet;
136+
struct icmphdr *icp;
137137
struct icmphdr *oicp = (struct icmphdr *) opacket;
138138
struct iphdr *ip = (struct iphdr *) packet;
139139

@@ -175,7 +175,6 @@ measure(struct sockaddr_in * addr)
175175
((__u32*)(oicp+1))[1] = 0;
176176
((__u32*)(oicp+1))[2] = 0;
177177
FD_ZERO(&ready);
178-
msgcount = 0;
179178

180179
acked = seqno = seqno0 = 0;
181180

@@ -310,7 +309,7 @@ measure_opt(struct sockaddr_in * addr)
310309
long delta1, delta2;
311310
struct timeval tv1, tout;
312311
unsigned char packet[PACKET_IN], opacket[64];
313-
struct icmphdr *icp = (struct icmphdr *) packet;
312+
struct icmphdr *icp;
314313
struct icmphdr *oicp = (struct icmphdr *) opacket;
315314
struct iphdr *ip = (struct iphdr *) packet;
316315

@@ -352,7 +351,6 @@ measure_opt(struct sockaddr_in * addr)
352351
((__u32*)(oicp+1))[2] = 0;
353352

354353
FD_ZERO(&ready);
355-
msgcount = 0;
356354

357355
acked = seqno = seqno0 = 0;
358356

ping.c

-4
Original file line numberDiff line numberDiff line change
@@ -1357,8 +1357,6 @@ void pr_options(unsigned char * cp, int hlen)
13571357
case IPOPT_LSRR:
13581358
printf("\n%cSRR: ", *cp==IPOPT_SSRR ? 'S' : 'L');
13591359
j = *++cp;
1360-
i = *++cp;
1361-
i -= 4;
13621360
cp++;
13631361
if (j > IPOPT_MINOFF) {
13641362
for (;;) {
@@ -1391,8 +1389,6 @@ void pr_options(unsigned char * cp, int hlen)
13911389
&& !memcmp(cp, old_rr, i)
13921390
&& !(options & F_FLOOD)) {
13931391
printf("\t(same route)");
1394-
i = ((i + 3) / 4) * 4;
1395-
cp += i;
13961392
break;
13971393
}
13981394
old_rrlen = i;

ping6_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,7 @@ static
12941294
void pr_niquery_reply_addr(struct ni_hdr *nih, int len)
12951295
{
12961296
__u8 *h = (__u8 *)(nih + 1);
1297-
__u8 *p = h + 4;
1297+
__u8 *p;
12981298
__u8 *end = (__u8 *)nih + len;
12991299
int af;
13001300
int aflen;

traceroute6.c

-1
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ int main(int argc, char *argv[])
609609
while ((cc = wait_for_reply(icmp_sock, &from, &to, reset_timer)) != 0) {
610610
gettimeofday(&t2, &tz);
611611
if ((i = packet_ok(packet, cc, &from, &to, seq, &t1))) {
612-
reset_timer = 1;
613612
if (memcmp(&from.sin6_addr, &lastaddr, sizeof(from.sin6_addr))) {
614613
print(packet, cc, &from);
615614
memcpy(&lastaddr,

0 commit comments

Comments
 (0)