svn commit: trunk/busybox/networking

[vda at busybox.net]

Author: vda
Date: 2007-06-14 00:47:52 -0700 (Thu, 14 Jun 2007)
New Revision: 18819

Log:
traceroute: stop using floating point needlessly; nuke useless assignment.

.rodata                                           129308  129312      +4
freehostinfo                                          35      29      -6
traceroute_main                                     4308    4300      -8



Modified:
   trunk/busybox/networking/traceroute.c


Changeset:
Modified: trunk/busybox/networking/traceroute.c
===================================================================
--- trunk/busybox/networking/traceroute.c	2007-06-13 18:13:51 UTC (rev 18818)
+++ trunk/busybox/networking/traceroute.c	2007-06-14 07:47:52 UTC (rev 18819)
@@ -710,16 +710,6 @@
 	}
 }
 
-static inline double
-deltaT(struct timeval *t1p, struct timeval *t2p)
-{
-	double dt;
-
-	dt = (double)(t2p->tv_sec - t1p->tv_sec) * 1000.0 +
-	     (double)(t2p->tv_usec - t1p->tv_usec) / 1000.0;
-	return dt;
-}
-
 #if ENABLE_FEATURE_TRACEROUTE_VERBOSE
 /*
  * Convert an ICMP "type" field to a printable string.
@@ -901,9 +891,8 @@
 freehostinfo(struct hostinfo *hi)
 {
 	free(hi->name);
-	hi->name = NULL;
-	free((char *)hi->addrs);
-	free((char *)hi);
+	free(hi->addrs);
+	free(hi);
 }
 
 #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
@@ -918,6 +907,12 @@
 }
 #endif
 
+static void
+print_delta_ms(struct timeval *t1p, struct timeval *t2p)
+{
+	unsigned tt = (t2p->tv_sec - t1p->tv_sec) * 1000000 + (t2p->tv_usec - t1p->tv_usec);
+	printf("  %u.%03u ms", tt/1000, tt%1000);
+}
 
 int traceroute_main(int argc, char **argv);
 int traceroute_main(int argc, char **argv)
@@ -1256,7 +1251,7 @@
 					lastaddr = from->sin_addr.s_addr;
 					++gotlastaddr;
 				}
-				printf("  %.3f ms", deltaT(&t1, &t2));
+				print_delta_ms(&t1, &t2);
 				ip = (struct ip *)packet;
 				if (op & OPT_TTL_FLAG)
 					printf(" (%d)", ip->ip_ttl);