Purely cosmetic/style(9) fixes: Remove unneeded indent in prototypes,
add space after return keyword.
Feedback/OK?
Index: ping.c
===================================================================
RCS file: /cvs/src/sbin/ping/ping.c,v
retrieving revision 1.220
diff -u -p -r1.220 ping.c
--- ping.c 4 Jul 2017 15:55:22 -0000 1.220
+++ ping.c 4 Jul 2017 21:43:12 -0000
@@ -208,34 +208,34 @@ volatile sig_atomic_t seenalrm;
volatile sig_atomic_t seenint;
volatile sig_atomic_t seeninfo;
-void fill(char *, char *);
-void summary(void);
-void onsignal(int);
-void retransmit(int);
-int pinger(int);
-const char *pr_addr(struct sockaddr *, socklen_t);
-void pr_pack(u_char *, int, struct msghdr *);
-__dead void usage(void);
+void fill(char *, char *);
+void summary(void);
+void onsignal(int);
+void retransmit(int);
+int pinger(int);
+const char *pr_addr(struct sockaddr *, socklen_t);
+void pr_pack(u_char *, int, struct msghdr *);
+__dead void usage(void);
/* IPv4 specific functions */
-void pr_ipopt(int, u_char *);
-int in_cksum(u_short *, int);
-void pr_icmph(struct icmp *);
-void pr_retip(struct ip *);
-void pr_iph(struct ip *);
+void pr_ipopt(int, u_char *);
+int in_cksum(u_short *, int);
+void pr_icmph(struct icmp *);
+void pr_retip(struct ip *);
+void pr_iph(struct ip *);
#ifndef SMALL
-int map_tos(char *, int *);
+int map_tos(char *, int *);
#endif /* SMALL */
/* IPv6 specific functions */
-int get_hoplim(struct msghdr *);
-int get_pathmtu(struct msghdr *, struct sockaddr_in6 *);
-void pr_icmph6(struct icmp6_hdr *, u_char *);
-void pr_iph6(struct ip6_hdr *);
-void pr_exthdrs(struct msghdr *);
-void pr_ip6opt(void *);
-void pr_rthdr(void *);
-void pr_retip6(struct ip6_hdr *, u_char *);
+int get_hoplim(struct msghdr *);
+int get_pathmtu(struct msghdr *, struct sockaddr_in6 *);
+void pr_icmph6(struct icmp6_hdr *, u_char *);
+void pr_iph6(struct ip6_hdr *);
+void pr_exthdrs(struct msghdr *);
+void pr_ip6opt(void *);
+void pr_rthdr(void *);
+void pr_retip6(struct ip6_hdr *, u_char *);
int
main(int argc, char *argv[])
@@ -572,7 +572,7 @@ main(int argc, char *argv[])
timing = 1;
if (v6flag) {
- /* in F_VERBOSE case, we may get non-echoreply packets*/
+ /* in F_VERBOSE case, we may get non-echoreply packets */
if (options & F_VERBOSE && datalen < 2048) /* XXX 2048? */
packlen = 2048 + IP6LEN + ECHOLEN + EXTRA;
else
@@ -965,7 +965,7 @@ pr_addr(struct sockaddr *addr, socklen_t
if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
return (buf);
else
- return "?";
+ return ("?");
}
/*
@@ -1023,7 +1023,7 @@ pinger(int s)
u_int16_t seq;
if (npackets && ntransmitted >= npackets)
- return(-1); /* no more transmission */
+ return (-1); /* no more transmission */
seq = htons(ntransmitted++);
@@ -1459,7 +1459,7 @@ in_cksum(u_short *addr, int len)
sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
sum += (sum >> 16); /* add carry */
answer = ~sum; /* truncate to 16 bits */
- return(answer);
+ return (answer);
}
/*
@@ -1849,15 +1849,15 @@ get_hoplim(struct msghdr *mhdr)
for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
if (cm->cmsg_len == 0)
- return(-1);
+ return (-1);
if (cm->cmsg_level == IPPROTO_IPV6 &&
cm->cmsg_type == IPV6_HOPLIMIT &&
cm->cmsg_len == CMSG_LEN(sizeof(int)))
- return(*(int *)CMSG_DATA(cm));
+ return (*(int *)CMSG_DATA(cm));
}
- return(-1);
+ return (-1);
}
int
@@ -1869,7 +1869,7 @@ get_pathmtu(struct msghdr *mhdr, struct
for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(mhdr); cm;
cm = (struct cmsghdr *)CMSG_NXTHDR(mhdr, cm)) {
if (cm->cmsg_len == 0)
- return(0);
+ return (0);
if (cm->cmsg_level == IPPROTO_IPV6 &&
cm->cmsg_type == IPV6_PATHMTU &&
@@ -1897,7 +1897,7 @@ get_pathmtu(struct msghdr *mhdr, struct
&mtuctl->ip6m_addr,
sizeof(mtuctl->ip6m_addr)));
}
- return(0);
+ return (0);
}
/*
@@ -1905,13 +1905,13 @@ get_pathmtu(struct msghdr *mhdr, struct
* the kernel check?
*/
if (mtuctl->ip6m_mtu < IPV6_MMTU)
- return(0);
+ return (0);
/* notification for our destination. return the MTU. */
- return((int)mtuctl->ip6m_mtu);
+ return ((int)mtuctl->ip6m_mtu);
}
}
- return(0);
+ return (0);
}
/*
