From owner-svn-src-stable-12@freebsd.org Sat Sep 7 10:55:12 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CC99EECF03; Sat, 7 Sep 2019 10:55:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46QWXw54Xyz4Mm9; Sat, 7 Sep 2019 10:55:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 91C3D479D; Sat, 7 Sep 2019 10:55:12 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x87AtCEp018770; Sat, 7 Sep 2019 10:55:12 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x87AtCnS018769; Sat, 7 Sep 2019 10:55:12 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201909071055.x87AtCnS018769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Sat, 7 Sep 2019 10:55:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r351976 - stable/12/usr.sbin/traceroute6 X-SVN-Group: stable-12 X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: stable/12/usr.sbin/traceroute6 X-SVN-Commit-Revision: 351976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Sep 2019 10:55:12 -0000 Author: tuexen Date: Sat Sep 7 10:55:12 2019 New Revision: 351976 URL: https://svnweb.freebsd.org/changeset/base/351976 Log: MFC r350026: Whitespace change. No functional change. Modified: stable/12/usr.sbin/traceroute6/traceroute6.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/traceroute6/traceroute6.c ============================================================================== --- stable/12/usr.sbin/traceroute6/traceroute6.c Sat Sep 7 10:53:29 2019 (r351975) +++ stable/12/usr.sbin/traceroute6/traceroute6.c Sat Sep 7 10:55:12 2019 (r351976) @@ -985,7 +985,7 @@ wait_for_reply(int sock, struct msghdr *mhdr) if (poll(pfd, 1, waittime * 1000) > 0) cc = recvmsg(rcvsock, mhdr, 0); - return(cc); + return (cc); #else fd_set *fdsp; struct timeval wait; @@ -1002,7 +1002,7 @@ wait_for_reply(int sock, struct msghdr *mhdr) cc = recvmsg(rcvsock, mhdr, 0); free(fdsp); - return(cc); + return (cc); #endif } @@ -1168,10 +1168,10 @@ get_hoplim(struct msghdr *mhdr) 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); } double @@ -1282,7 +1282,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq) strlcpy(hbuf, "invalid", sizeof(hbuf)); printf("data too short (%d bytes) from %s\n", cc, hbuf); } - return(0); + return (0); } icp = (struct icmp6_hdr *)buf; #endif @@ -1305,7 +1305,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq) if (rcvpktinfo == NULL || hlimp == NULL) { warnx("failed to get received hop limit or packet info"); #if 0 - return(0); + return (0); #else rcvhlim = 0; /*XXX*/ #endif @@ -1329,7 +1329,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq) if ((up = get_uphdr(hip, (u_char *)(buf + cc))) == NULL) { if (verbose) warnx("failed to get upper layer header"); - return(0); + return (0); } switch (useproto) { case IPPROTO_ICMPV6: @@ -1424,7 +1424,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq) if (cc % WIDTH != 0) printf("\n"); } - return(0); + return (0); } /* @@ -1438,7 +1438,7 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim) static u_char none_hdr[1]; /* Fake pointer for IPPROTO_NONE. */ if (cp + sizeof(*ip6) > lim) - return(NULL); + return (NULL); nh = ip6->ip6_nxt; cp += sizeof(struct ip6_hdr); @@ -1446,15 +1446,15 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim) while (lim - cp >= (nh == IPPROTO_NONE ? 0 : 8)) { switch (nh) { case IPPROTO_ESP: - return(NULL); + return (NULL); case IPPROTO_ICMPV6: - return(useproto == nh ? cp : NULL); + return (useproto == nh ? cp : NULL); case IPPROTO_SCTP: case IPPROTO_TCP: case IPPROTO_UDP: - return(useproto == nh ? cp : NULL); + return (useproto == nh ? cp : NULL); case IPPROTO_NONE: - return(useproto == nh ? none_hdr : NULL); + return (useproto == nh ? none_hdr : NULL); case IPPROTO_FRAGMENT: hlen = sizeof(struct ip6_frag); nh = ((struct ip6_frag *)cp)->ip6f_nxt; @@ -1472,7 +1472,7 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim) cp += hlen; } - return(NULL); + return (NULL); } void