Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 30 Nov 2020 09:08:51 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r368171 - stable/12/sys/netinet
Message-ID:  <202011300908.0AU98pTa083910@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tuexen
Date: Mon Nov 30 09:08:51 2020
New Revision: 368171
URL: https://svnweb.freebsd.org/changeset/base/368171

Log:
  MFC r366426:
  
  Use __func__ instead of __FUNCTION__ for consistency.

Modified:
  stable/12/sys/netinet/sctp_bsd_addr.c
  stable/12/sys/netinet/sctp_indata.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/sctp_bsd_addr.c
==============================================================================
--- stable/12/sys/netinet/sctp_bsd_addr.c	Mon Nov 30 09:07:21 2020	(r368170)
+++ stable/12/sys/netinet/sctp_bsd_addr.c	Mon Nov 30 09:08:51 2020	(r368171)
@@ -378,7 +378,7 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, int w
 			m_freem(m);
 			return (NULL);
 		}
-		KASSERT(SCTP_BUF_NEXT(m) == NULL, ("%s: no chain allowed", __FUNCTION__));
+		KASSERT(SCTP_BUF_NEXT(m) == NULL, ("%s: no chain allowed", __func__));
 	}
 #ifdef SCTP_MBUF_LOGGING
 	if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MBUF_LOGGING_ENABLE) {

Modified: stable/12/sys/netinet/sctp_indata.c
==============================================================================
--- stable/12/sys/netinet/sctp_indata.c	Mon Nov 30 09:07:21 2020	(r368170)
+++ stable/12/sys/netinet/sctp_indata.c	Mon Nov 30 09:08:51 2020	(r368171)
@@ -305,7 +305,7 @@ sctp_mark_non_revokable(struct sctp_association *asoc,
 	SCTP_CALC_TSN_TO_GAP(gap, tsn, asoc->mapping_array_base_tsn);
 	in_r = SCTP_IS_TSN_PRESENT(asoc->mapping_array, gap);
 	in_nr = SCTP_IS_TSN_PRESENT(asoc->nr_mapping_array, gap);
-	KASSERT(in_r || in_nr, ("%s: Things are really messed up now", __FUNCTION__));
+	KASSERT(in_r || in_nr, ("%s: Things are really messed up now", __func__));
 	if (!in_nr) {
 		SCTP_SET_TSN_PRESENT(asoc->nr_mapping_array, gap);
 		if (SCTP_TSN_GT(tsn, asoc->highest_tsn_inside_nr_map)) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011300908.0AU98pTa083910>