Date: Thu, 26 Sep 2024 05:20:43 GMT From: Zhenlei Huang <zlei@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a8eb9e3844da - stable/14 - iflib: Prefer C99's __func__ over GCC's __FUNCTION__ Message-ID: <202409260520.48Q5KhgK079727@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a8eb9e3844dacbf2c3d7e8e85b7fe23c2ea7f7eb commit a8eb9e3844dacbf2c3d7e8e85b7fe23c2ea7f7eb Author: Zhenlei Huang <zlei@FreeBSD.org> AuthorDate: 2024-09-22 02:07:38 +0000 Commit: Zhenlei Huang <zlei@FreeBSD.org> CommitDate: 2024-09-26 05:19:01 +0000 iflib: Prefer C99's __func__ over GCC's __FUNCTION__ MFC after: 3 days (cherry picked from commit b90ba458dcaecc4041e008b99fde003bc9867a0d) --- sys/net/iflib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index c6a01624436c..63a2f6be5b5e 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -3874,7 +3874,7 @@ iflib_completed_tx_reclaim(iflib_txq_t txq, int thresh) if (reclaim <= thresh /* + MAX_TX_DESC(txq->ift_ctx) */) { #ifdef INVARIANTS if (iflib_verbose_debug) { - printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __FUNCTION__, + printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __func__, txq->ift_processed, txq->ift_cleaned, txq->ift_ctx->ifc_softc_ctx.isc_tx_nsegments, reclaim, thresh); } @@ -3980,7 +3980,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) count = MIN(avail, TX_BATCH_SIZE); #ifdef INVARIANTS if (iflib_verbose_debug) - printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __FUNCTION__, + printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __func__, avail, ctx->ifc_flags, TXQ_AVAIL(txq)); #endif do_prefetch = (ctx->ifc_flags & IFC_PREFETCH);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409260520.48Q5KhgK079727>