From nobody Tue May 06 22:21:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZsXt742GXz5vXds; Tue, 06 May 2025 22:21:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXt71fcpz3lg5; Tue, 06 May 2025 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746570079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2QsUFXbB2yPPRVA1/BBerUefDNj1t/9R0xMRgAk4Vo=; b=IDqByfiNGwkiZoXzf9lGcRKJi0a82G8y3C65c0PyXC8Bb1uZjRvmQQY+qe1N/cFpZboxLt GdwDHbLSSgnk7xQ4lTbZdwM/aUXLWbxJhFXINTrQnEI2LMiRnJIWdBL14mlJmx36GZAALT D5ITKtCnuzgmwIYexMsPHmu6VC++98F0xCSQ537V/IaCnJRkiPBbrc43h10AnraE5Jbb2x /XMlo6cMayASoBCYwVxcogKN/ZcWo9xrbE7HgIQdzwbE7KOc3A4WehunXwmzfkxCBO1WFt vkSWwycC5zGg6H0tsWJu34fQcwfHnJVEEsA/plfwQAN8lbW2oOwzgFpkKtGVww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746570079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/2QsUFXbB2yPPRVA1/BBerUefDNj1t/9R0xMRgAk4Vo=; b=beXrhiDgU5lQ2DgE3oBOxzTL5iz6rPPnQWQ6xk+N0KOA5KEytivtjVw+DZVW5msgPcvTB4 w64BDOuHFyd0ZVexDHSYwgj6GPiuXMj0R/dIqgFxthGA2g08p/VLOw9wW7V9I8ONjGb3mo m6tzRnGk07Ut2X7PKRl7/inAW0D/7wJ/5waNSDkbq42Tye5jrbCm1bUqJsnjzbnm/RKA+g 9Atu4OJTIopjP1u9IIzlOarBCxCC+Fvq/TTR1ax0xxHT6Nbw8I2htN2mMRYJmiRY2Nrpna G5XKMN2xzLJzvTxmmdXcVoojAzdweoQEYobFFPyDN/iAeImDzb3fvEBkeyH3+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746570079; a=rsa-sha256; cv=none; b=l7i/VkZsyNbn9GOnAbixVCAzfcEK4xfxKr4xywb7Fp1nPzi/m4aKH1FORTITuoItjh9lmZ V9L0rAU6Vb+JWyoq/qGPkwwlZyd1nz4Ct1X6rFxyQz8naqtseR31IBvIoD6bx0oPpOEIbY /0zL0W06p5v8kD3YWEetoU87asN71Ff1ogr/qnaLwMcMUqylZPFVx+bF6eNtT/SEphz23n aUbsM9+9qQFnDtBmVU+XHZ6W+mFxpARAt6HLbzR6oE+QIMF/MxER3SBhOXe46m9ZKi5r8x FM1DswRM7PViKYsRoHYocgIjk1Ba1NAHjxjZpF7irV1YYWwCbjI4PDt7iZtCPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZsXt71CC5z1HTk; Tue, 06 May 2025 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 546MLJV1076650; Tue, 6 May 2025 22:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546MLJvv076647; Tue, 6 May 2025 22:21:19 GMT (envelope-from git) Date: Tue, 6 May 2025 22:21:19 GMT Message-Id: <202505062221.546MLJvv076647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c15cdaf50584 - main - sys/queue.h: use reserved identifiers with the file scope for locals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c15cdaf505849509900b018a44d91eee3647fb13 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c15cdaf505849509900b018a44d91eee3647fb13 commit c15cdaf505849509900b018a44d91eee3647fb13 Author: Konstantin Belousov AuthorDate: 2025-05-06 18:09:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-06 22:17:23 +0000 sys/queue.h: use reserved identifiers with the file scope for locals This should prevent conflicts with the C-standard compliant code, although sys/queue.h is not a standard header. Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50216 --- sys/sys/queue.h | 94 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index b2ba3d63bb0c..aa6453889e6b 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -273,14 +273,14 @@ struct { \ "slist %p is empty", (head)) #define SLIST_CONCAT(head1, head2, type, field) do { \ - QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head1); \ - if (curelm == NULL) { \ + QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head1); \ + if (_Curelm == NULL) { \ if ((SLIST_FIRST(head1) = SLIST_FIRST(head2)) != NULL) \ SLIST_INIT(head2); \ } else if (SLIST_FIRST(head2) != NULL) { \ - while (SLIST_NEXT(curelm, field) != NULL) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_NEXT(curelm, field) = SLIST_FIRST(head2); \ + while (SLIST_NEXT(_Curelm, field) != NULL) \ + _Curelm = SLIST_NEXT(_Curelm, field); \ + SLIST_NEXT(_Curelm, field) = SLIST_FIRST(head2); \ SLIST_INIT(head2); \ } \ } while (0) @@ -338,24 +338,24 @@ struct { \ SLIST_REMOVE_HEAD((head), field); \ } \ else { \ - QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head); \ - while (SLIST_NEXT(curelm, field) != (elm)) \ - curelm = SLIST_NEXT(curelm, field); \ - SLIST_REMOVE_AFTER(curelm, field); \ + QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head); \ + while (SLIST_NEXT(_Curelm, field) != (elm)) \ + _Curelm = SLIST_NEXT(_Curelm, field); \ + SLIST_REMOVE_AFTER(_Curelm, field); \ } \ } while (0) #define SLIST_REMOVE_AFTER(elm, field) do { \ - QMD_SAVELINK(oldnext, SLIST_NEXT(elm, field)->field.sle_next); \ + QMD_SAVELINK(_Oldnext, SLIST_NEXT(elm, field)->field.sle_next); \ SLIST_NEXT(elm, field) = \ SLIST_NEXT(SLIST_NEXT(elm, field), field); \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define SLIST_REMOVE_HEAD(head, field) do { \ - QMD_SAVELINK(oldnext, SLIST_FIRST(head)->field.sle_next); \ + QMD_SAVELINK(_Oldnext, SLIST_FIRST(head)->field.sle_next); \ SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define SLIST_REMOVE_PREVPTR(prevp, elm, field) do { \ @@ -371,9 +371,9 @@ struct { \ } while (0) #define SLIST_SWAP(head1, head2, type) do { \ - QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \ + QUEUE_TYPEOF(type) *_Swap_first = SLIST_FIRST(head1); \ SLIST_FIRST(head1) = SLIST_FIRST(head2); \ - SLIST_FIRST(head2) = swap_first; \ + SLIST_FIRST(head2) = _Swap_first; \ } while (0) #define SLIST_END(head) NULL @@ -512,17 +512,17 @@ struct { \ #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next) #define STAILQ_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \ + QMD_SAVELINK(_Oldnext, (elm)->field.stqe_next); \ if (STAILQ_FIRST((head)) == (elm)) { \ STAILQ_REMOVE_HEAD((head), field); \ } \ else { \ - QUEUE_TYPEOF(type) *curelm = STAILQ_FIRST(head); \ - while (STAILQ_NEXT(curelm, field) != (elm)) \ - curelm = STAILQ_NEXT(curelm, field); \ - STAILQ_REMOVE_AFTER(head, curelm, field); \ + QUEUE_TYPEOF(type) *_Curelm = STAILQ_FIRST(head); \ + while (STAILQ_NEXT(_Curelm, field) != (elm)) \ + _Curelm = STAILQ_NEXT(_Curelm, field); \ + STAILQ_REMOVE_AFTER(head, _Curelm, field); \ } \ - TRASHIT(*oldnext); \ + TRASHIT(*_Oldnext); \ } while (0) #define STAILQ_REMOVE_AFTER(head, elm, field) do { \ @@ -552,12 +552,12 @@ struct { \ } while (0) #define STAILQ_SWAP(head1, head2, type) do { \ - QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \ - QUEUE_TYPEOF(type) **swap_last = (head1)->stqh_last; \ + QUEUE_TYPEOF(type) *_Swap_first = STAILQ_FIRST(head1); \ + QUEUE_TYPEOF(type) **_Swap_last = (head1)->stqh_last; \ STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \ (head1)->stqh_last = (head2)->stqh_last; \ - STAILQ_FIRST(head2) = swap_first; \ - (head2)->stqh_last = swap_last; \ + STAILQ_FIRST(head2) = _Swap_first; \ + (head2)->stqh_last = _Swap_last; \ if (STAILQ_FIRST(head1) == NULL) \ (head1)->stqh_last = &STAILQ_FIRST(head1); \ if (STAILQ_FIRST(head2) == NULL) \ @@ -658,18 +658,18 @@ struct { \ "list %p is empty", (head)) #define LIST_CONCAT(head1, head2, type, field) do { \ - QUEUE_TYPEOF(type) *curelm = LIST_FIRST(head1); \ - if (curelm == NULL) { \ + QUEUE_TYPEOF(type) *_Curelm = LIST_FIRST(head1); \ + if (_Curelm == NULL) { \ if ((LIST_FIRST(head1) = LIST_FIRST(head2)) != NULL) { \ LIST_FIRST(head2)->field.le_prev = \ &LIST_FIRST((head1)); \ LIST_INIT(head2); \ } \ } else if (LIST_FIRST(head2) != NULL) { \ - while (LIST_NEXT(curelm, field) != NULL) \ - curelm = LIST_NEXT(curelm, field); \ - LIST_NEXT(curelm, field) = LIST_FIRST(head2); \ - LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(curelm, field);\ + while (LIST_NEXT(_Curelm, field) != NULL) \ + _Curelm = LIST_NEXT(_Curelm, field); \ + LIST_NEXT(_Curelm, field) = LIST_FIRST(head2); \ + LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(_Curelm, field);\ LIST_INIT(head2); \ } \ } while (0) @@ -741,21 +741,21 @@ struct { \ LIST_REMOVE(LIST_FIRST(head), field) #define LIST_REMOVE(elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \ QMD_LIST_CHECK_NEXT(elm, field); \ QMD_LIST_CHECK_PREV(elm, field); \ if (LIST_NEXT((elm), field) != NULL) \ LIST_NEXT((elm), field)->field.le_prev = \ (elm)->field.le_prev; \ *(elm)->field.le_prev = LIST_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ } while (0) #define LIST_REPLACE(elm, elm2, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.le_next); \ - QMD_SAVELINK(oldprev, (elm)->field.le_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \ QMD_LIST_CHECK_NEXT(elm, field); \ QMD_LIST_CHECK_PREV(elm, field); \ LIST_NEXT((elm2), field) = LIST_NEXT((elm), field); \ @@ -764,8 +764,8 @@ struct { \ &(elm2)->field.le_next; \ (elm2)->field.le_prev = (elm)->field.le_prev; \ *(elm2)->field.le_prev = (elm2); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ } while (0) #define LIST_SPLIT_AFTER(head, elm, rest, field) do { \ @@ -1022,8 +1022,8 @@ struct { \ TAILQ_REMOVE(head, TAILQ_FIRST(head), field) #define TAILQ_REMOVE(head, elm, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \ QMD_TAILQ_CHECK_NEXT(elm, field); \ QMD_TAILQ_CHECK_PREV(elm, field); \ if ((TAILQ_NEXT((elm), field)) != NULL) \ @@ -1034,14 +1034,14 @@ struct { \ QMD_TRACE_HEAD(head); \ } \ *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) #define TAILQ_REPLACE(head, elm, elm2, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ - QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \ QMD_TAILQ_CHECK_NEXT(elm, field); \ QMD_TAILQ_CHECK_PREV(elm, field); \ TAILQ_NEXT((elm2), field) = TAILQ_NEXT((elm), field); \ @@ -1052,8 +1052,8 @@ struct { \ (head)->tqh_last = &(elm2)->field.tqe_next; \ (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \ *(elm2)->field.tqe_prev = (elm2); \ - TRASHIT(*oldnext); \ - TRASHIT(*oldprev); \ + TRASHIT(*_Oldnext); \ + TRASHIT(*_Oldprev); \ QMD_TRACE_ELEM(&(elm)->field); \ } while (0)