From owner-freebsd-bugs@FreeBSD.ORG Wed Jan 20 21:20:06 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67D15106568B for ; Wed, 20 Jan 2010 21:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 279588FC0A for ; Wed, 20 Jan 2010 21:20:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0KLK6eA016993 for ; Wed, 20 Jan 2010 21:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0KLK6Pw016992; Wed, 20 Jan 2010 21:20:06 GMT (envelope-from gnats) Resent-Date: Wed, 20 Jan 2010 21:20:06 GMT Resent-Message-Id: <201001202120.o0KLK6Pw016992@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeremy Huddleston Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 776FA106566B for ; Wed, 20 Jan 2010 21:19:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 678A18FC13 for ; Wed, 20 Jan 2010 21:19:42 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o0KLJgCX082706 for ; Wed, 20 Jan 2010 21:19:42 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o0KLJg2t082705; Wed, 20 Jan 2010 21:19:42 GMT (envelope-from nobody) Message-Id: <201001202119.o0KLJg2t082705@www.freebsd.org> Date: Wed, 20 Jan 2010 21:19:42 GMT From: Jeremy Huddleston To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/143033: _SWAP not listed in comment in sys/queue.h X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2010 21:20:06 -0000 >Number: 143033 >Category: misc >Synopsis: _SWAP not listed in comment in sys/queue.h >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Wed Jan 20 21:20:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jeremy Huddleston >Release: 8.0 >Organization: Apple >Environment: NA >Description: _SWAP is not listed in the list of macros in the documentation comment in queue.h Also attaching a convenience fix which places STAILQ_REMOVE_HEAD correctly in alphabetical order. >How-To-Repeat: >Fix: Index: queue.h =================================================================== RCS file: /home/ncvs/src/sys/sys/queue.h,v retrieving revision 1.72 diff -u -p -r1.72 queue.h --- queue.h 27 May 2009 19:28:04 -0000 1.72 +++ queue.h 20 Jan 2010 21:14:53 -0000 @@ -99,6 +99,7 @@ * _REMOVE_AFTER + - + - * _REMOVE_HEAD + - + - * _REMOVE + + + + + * _SWAP - + + + * */ #ifdef QUEUE_MACRO_DEBUG @@ -297,18 +298,18 @@ struct { \ TRASHIT((elm)->field.stqe_next); \ } while (0) -#define STAILQ_REMOVE_HEAD(head, field) do { \ - if ((STAILQ_FIRST((head)) = \ - STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ - (head)->stqh_last = &STAILQ_FIRST((head)); \ -} while (0) - #define STAILQ_REMOVE_AFTER(head, elm, field) do { \ if ((STAILQ_NEXT(elm, field) = \ STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL) \ (head)->stqh_last = &STAILQ_NEXT((elm), field); \ } while (0) +#define STAILQ_REMOVE_HEAD(head, field) do { \ + if ((STAILQ_FIRST((head)) = \ + STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \ + (head)->stqh_last = &STAILQ_FIRST((head)); \ +} while (0) + #define STAILQ_SWAP(head1, head2, type) do { \ struct type *swap_first = STAILQ_FIRST(head1); \ struct type **swap_last = (head1)->stqh_last; \ >Release-Note: >Audit-Trail: >Unformatted: