Skip to content

Commit c15cdaf

Browse files
kostikbelkostikbel
committed
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
1 parent d71c970 commit c15cdaf

1 file changed

Lines changed: 47 additions & 47 deletions

File tree

‎sys/sys/queue.h‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@ struct { \
273273
"slist %p is empty", (head))
274274

275275
#define SLIST_CONCAT(head1, head2, type, field) do { \
276-
QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head1); \
277-
if (curelm == NULL) { \
276+
QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head1); \
277+
if (_Curelm == NULL) { \
278278
if ((SLIST_FIRST(head1) = SLIST_FIRST(head2)) != NULL) \
279279
SLIST_INIT(head2); \
280280
} else if (SLIST_FIRST(head2) != NULL) { \
281-
while (SLIST_NEXT(curelm, field) != NULL) \
282-
curelm = SLIST_NEXT(curelm, field); \
283-
SLIST_NEXT(curelm, field) = SLIST_FIRST(head2); \
281+
while (SLIST_NEXT(_Curelm, field) != NULL) \
282+
_Curelm = SLIST_NEXT(_Curelm, field); \
283+
SLIST_NEXT(_Curelm, field) = SLIST_FIRST(head2); \
284284
SLIST_INIT(head2); \
285285
} \
286286
} while (0)
@@ -338,24 +338,24 @@ struct { \
338338
SLIST_REMOVE_HEAD((head), field); \
339339
} \
340340
else { \
341-
QUEUE_TYPEOF(type) *curelm = SLIST_FIRST(head); \
342-
while (SLIST_NEXT(curelm, field) != (elm)) \
343-
curelm = SLIST_NEXT(curelm, field); \
344-
SLIST_REMOVE_AFTER(curelm, field); \
341+
QUEUE_TYPEOF(type) *_Curelm = SLIST_FIRST(head); \
342+
while (SLIST_NEXT(_Curelm, field) != (elm)) \
343+
_Curelm = SLIST_NEXT(_Curelm, field); \
344+
SLIST_REMOVE_AFTER(_Curelm, field); \
345345
} \
346346
} while (0)
347347

348348
#define SLIST_REMOVE_AFTER(elm, field) do { \
349-
QMD_SAVELINK(oldnext, SLIST_NEXT(elm, field)->field.sle_next); \
349+
QMD_SAVELINK(_Oldnext, SLIST_NEXT(elm, field)->field.sle_next); \
350350
SLIST_NEXT(elm, field) = \
351351
SLIST_NEXT(SLIST_NEXT(elm, field), field); \
352-
TRASHIT(*oldnext); \
352+
TRASHIT(*_Oldnext); \
353353
} while (0)
354354

355355
#define SLIST_REMOVE_HEAD(head, field) do { \
356-
QMD_SAVELINK(oldnext, SLIST_FIRST(head)->field.sle_next); \
356+
QMD_SAVELINK(_Oldnext, SLIST_FIRST(head)->field.sle_next); \
357357
SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
358-
TRASHIT(*oldnext); \
358+
TRASHIT(*_Oldnext); \
359359
} while (0)
360360

361361
#define SLIST_REMOVE_PREVPTR(prevp, elm, field) do { \
@@ -371,9 +371,9 @@ struct { \
371371
} while (0)
372372

373373
#define SLIST_SWAP(head1, head2, type) do { \
374-
QUEUE_TYPEOF(type) *swap_first = SLIST_FIRST(head1); \
374+
QUEUE_TYPEOF(type) *_Swap_first = SLIST_FIRST(head1); \
375375
SLIST_FIRST(head1) = SLIST_FIRST(head2); \
376-
SLIST_FIRST(head2) = swap_first; \
376+
SLIST_FIRST(head2) = _Swap_first; \
377377
} while (0)
378378

379379
#define SLIST_END(head) NULL
@@ -512,17 +512,17 @@ struct { \
512512
#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
513513

514514
#define STAILQ_REMOVE(head, elm, type, field) do { \
515-
QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \
515+
QMD_SAVELINK(_Oldnext, (elm)->field.stqe_next); \
516516
if (STAILQ_FIRST((head)) == (elm)) { \
517517
STAILQ_REMOVE_HEAD((head), field); \
518518
} \
519519
else { \
520-
QUEUE_TYPEOF(type) *curelm = STAILQ_FIRST(head); \
521-
while (STAILQ_NEXT(curelm, field) != (elm)) \
522-
curelm = STAILQ_NEXT(curelm, field); \
523-
STAILQ_REMOVE_AFTER(head, curelm, field); \
520+
QUEUE_TYPEOF(type) *_Curelm = STAILQ_FIRST(head); \
521+
while (STAILQ_NEXT(_Curelm, field) != (elm)) \
522+
_Curelm = STAILQ_NEXT(_Curelm, field); \
523+
STAILQ_REMOVE_AFTER(head, _Curelm, field); \
524524
} \
525-
TRASHIT(*oldnext); \
525+
TRASHIT(*_Oldnext); \
526526
} while (0)
527527

528528
#define STAILQ_REMOVE_AFTER(head, elm, field) do { \
@@ -552,12 +552,12 @@ struct { \
552552
} while (0)
553553

554554
#define STAILQ_SWAP(head1, head2, type) do { \
555-
QUEUE_TYPEOF(type) *swap_first = STAILQ_FIRST(head1); \
556-
QUEUE_TYPEOF(type) **swap_last = (head1)->stqh_last; \
555+
QUEUE_TYPEOF(type) *_Swap_first = STAILQ_FIRST(head1); \
556+
QUEUE_TYPEOF(type) **_Swap_last = (head1)->stqh_last; \
557557
STAILQ_FIRST(head1) = STAILQ_FIRST(head2); \
558558
(head1)->stqh_last = (head2)->stqh_last; \
559-
STAILQ_FIRST(head2) = swap_first; \
560-
(head2)->stqh_last = swap_last; \
559+
STAILQ_FIRST(head2) = _Swap_first; \
560+
(head2)->stqh_last = _Swap_last; \
561561
if (STAILQ_FIRST(head1) == NULL) \
562562
(head1)->stqh_last = &STAILQ_FIRST(head1); \
563563
if (STAILQ_FIRST(head2) == NULL) \
@@ -658,18 +658,18 @@ struct { \
658658
"list %p is empty", (head))
659659

660660
#define LIST_CONCAT(head1, head2, type, field) do { \
661-
QUEUE_TYPEOF(type) *curelm = LIST_FIRST(head1); \
662-
if (curelm == NULL) { \
661+
QUEUE_TYPEOF(type) *_Curelm = LIST_FIRST(head1); \
662+
if (_Curelm == NULL) { \
663663
if ((LIST_FIRST(head1) = LIST_FIRST(head2)) != NULL) { \
664664
LIST_FIRST(head2)->field.le_prev = \
665665
&LIST_FIRST((head1)); \
666666
LIST_INIT(head2); \
667667
} \
668668
} else if (LIST_FIRST(head2) != NULL) { \
669-
while (LIST_NEXT(curelm, field) != NULL) \
670-
curelm = LIST_NEXT(curelm, field); \
671-
LIST_NEXT(curelm, field) = LIST_FIRST(head2); \
672-
LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(curelm, field);\
669+
while (LIST_NEXT(_Curelm, field) != NULL) \
670+
_Curelm = LIST_NEXT(_Curelm, field); \
671+
LIST_NEXT(_Curelm, field) = LIST_FIRST(head2); \
672+
LIST_FIRST(head2)->field.le_prev = &LIST_NEXT(_Curelm, field);\
673673
LIST_INIT(head2); \
674674
} \
675675
} while (0)
@@ -741,21 +741,21 @@ struct { \
741741
LIST_REMOVE(LIST_FIRST(head), field)
742742

743743
#define LIST_REMOVE(elm, field) do { \
744-
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
745-
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
744+
QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \
745+
QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \
746746
QMD_LIST_CHECK_NEXT(elm, field); \
747747
QMD_LIST_CHECK_PREV(elm, field); \
748748
if (LIST_NEXT((elm), field) != NULL) \
749749
LIST_NEXT((elm), field)->field.le_prev = \
750750
(elm)->field.le_prev; \
751751
*(elm)->field.le_prev = LIST_NEXT((elm), field); \
752-
TRASHIT(*oldnext); \
753-
TRASHIT(*oldprev); \
752+
TRASHIT(*_Oldnext); \
753+
TRASHIT(*_Oldprev); \
754754
} while (0)
755755

756756
#define LIST_REPLACE(elm, elm2, field) do { \
757-
QMD_SAVELINK(oldnext, (elm)->field.le_next); \
758-
QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
757+
QMD_SAVELINK(_Oldnext, (elm)->field.le_next); \
758+
QMD_SAVELINK(_Oldprev, (elm)->field.le_prev); \
759759
QMD_LIST_CHECK_NEXT(elm, field); \
760760
QMD_LIST_CHECK_PREV(elm, field); \
761761
LIST_NEXT((elm2), field) = LIST_NEXT((elm), field); \
@@ -764,8 +764,8 @@ struct { \
764764
&(elm2)->field.le_next; \
765765
(elm2)->field.le_prev = (elm)->field.le_prev; \
766766
*(elm2)->field.le_prev = (elm2); \
767-
TRASHIT(*oldnext); \
768-
TRASHIT(*oldprev); \
767+
TRASHIT(*_Oldnext); \
768+
TRASHIT(*_Oldprev); \
769769
} while (0)
770770

771771
#define LIST_SPLIT_AFTER(head, elm, rest, field) do { \
@@ -1022,8 +1022,8 @@ struct { \
10221022
TAILQ_REMOVE(head, TAILQ_FIRST(head), field)
10231023

10241024
#define TAILQ_REMOVE(head, elm, field) do { \
1025-
QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
1026-
QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
1025+
QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \
1026+
QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \
10271027
QMD_TAILQ_CHECK_NEXT(elm, field); \
10281028
QMD_TAILQ_CHECK_PREV(elm, field); \
10291029
if ((TAILQ_NEXT((elm), field)) != NULL) \
@@ -1034,14 +1034,14 @@ struct { \
10341034
QMD_TRACE_HEAD(head); \
10351035
} \
10361036
*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \
1037-
TRASHIT(*oldnext); \
1038-
TRASHIT(*oldprev); \
1037+
TRASHIT(*_Oldnext); \
1038+
TRASHIT(*_Oldprev); \
10391039
QMD_TRACE_ELEM(&(elm)->field); \
10401040
} while (0)
10411041

10421042
#define TAILQ_REPLACE(head, elm, elm2, field) do { \
1043-
QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
1044-
QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
1043+
QMD_SAVELINK(_Oldnext, (elm)->field.tqe_next); \
1044+
QMD_SAVELINK(_Oldprev, (elm)->field.tqe_prev); \
10451045
QMD_TAILQ_CHECK_NEXT(elm, field); \
10461046
QMD_TAILQ_CHECK_PREV(elm, field); \
10471047
TAILQ_NEXT((elm2), field) = TAILQ_NEXT((elm), field); \
@@ -1052,8 +1052,8 @@ struct { \
10521052
(head)->tqh_last = &(elm2)->field.tqe_next; \
10531053
(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
10541054
*(elm2)->field.tqe_prev = (elm2); \
1055-
TRASHIT(*oldnext); \
1056-
TRASHIT(*oldprev); \
1055+
TRASHIT(*_Oldnext); \
1056+
TRASHIT(*_Oldprev); \
10571057
QMD_TRACE_ELEM(&(elm)->field); \
10581058
} while (0)
10591059

0 commit comments

Comments
 (0)