changeset 1586:6db5787d340b draft

Minor whitespace cleanups.
author Rob Landley <rob@landley.net>
date Sat, 29 Nov 2014 19:07:08 -0600
parents cff20c82a797
children a35ea98b4972
files toys/pending/arping.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/toys/pending/arping.c	Sat Nov 29 18:38:05 2014 -0600
+++ b/toys/pending/arping.c	Sat Nov 29 19:07:08 2014 -0600
@@ -116,18 +116,18 @@
 
   ptr = mempcpy(ptr, &src_pk.sll_addr, src_pk.sll_halen);
   ptr = mempcpy(ptr, &src_addr, 4);
-  if (toys.optflags & FLAG_A) 
-    ptr = mempcpy(ptr, &src_pk.sll_addr, src_pk.sll_halen);
-  else ptr = mempcpy(ptr, &dst_pk.sll_addr, src_pk.sll_halen);
+  ptr = mempcpy(ptr,
+                (toys.optflags & FLAG_A) ? &src_pk.sll_addr : &dst_pk.sll_addr,
+                src_pk.sll_halen);
+  ptr = mempcpy(ptr, &dest_addr, 4);
 
-  ptr = mempcpy(ptr, &dest_addr, 4);
   ret = sendto(TT.sockfd, sbuf, ptr - sbuf, 0, 
       (struct sockaddr *)&dst_pk, sizeof(dst_pk));
   if (ret == ptr - sbuf) {
     struct timeval tval;
 
     gettimeofday(&tval, NULL);
-    TT.sent_at = (tval.tv_sec * 1000000ULL + (tval.tv_usec));
+    TT.sent_at = tval.tv_sec * 1000000ULL + tval.tv_usec;
     TT.sent_nr++;
     if (!TT.unicast_flag) TT.brd_sent++;
   }