On Fri, Sep 12, 2014 at 02:23:34PM -0600, Todd C. Miller wrote:
> No objection here. I'd go a step farther and nuke all the FOO_END
> macros as well. They add nothing and just make code harder to read.
In preparation for that, this replaces all <queue>_END macro calls.
Since we're not calling CIRCLEQ_* anywhere in the tree, there's no need
to keep the symmetry.
Ok?
Index: bin/md5/md5.c
===================================================================
RCS file: /cvs/src/bin/md5/md5.c,v
retrieving revision 1.76
diff -u -p -r1.76 md5.c
--- bin/md5/md5.c 19 Jun 2014 15:30:49 -0000 1.76
+++ bin/md5/md5.c 13 Sep 2014 01:44:57 -0000
@@ -263,7 +263,7 @@ main(int argc, char **argv)
strcmp(hf->name, hftmp->name) == 0)
break;
}
- if (hftmp == TAILQ_END(&hl))
+ if (hftmp == NULL)
hash_insert(&hl, hf, base64);
}
break;
Index: lib/libevent/event-internal.h
===================================================================
RCS file: /cvs/src/lib/libevent/event-internal.h,v
retrieving revision 1.6
diff -u -p -r1.6 event-internal.h
--- lib/libevent/event-internal.h 21 Apr 2010 20:02:40 -0000 1.6
+++ lib/libevent/event-internal.h 13 Sep 2014 01:45:11 -0000
@@ -78,7 +78,7 @@ struct event_base {
#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
#define TAILQ_FOREACH(var, head, field)
\
for((var) = TAILQ_FIRST(head); \
- (var) != TAILQ_END(head); \
+ (var) != NULL; \
(var) = TAILQ_NEXT(var, field))
#define TAILQ_INSERT_BEFORE(listelm, elm, field) do {
\
(elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
Index: sbin/pfctl/parse.y
===================================================================
RCS file: /cvs/src/sbin/pfctl/parse.y,v
retrieving revision 1.638
diff -u -p -r1.638 parse.y
--- sbin/pfctl/parse.y 23 Aug 2014 00:11:03 -0000 1.638
+++ sbin/pfctl/parse.y 13 Sep 2014 01:45:15 -0000
@@ -1152,8 +1152,8 @@ tabledef : TABLE '<' STRING '>' table_op
YYERROR;
}
free($3);
- for (ti = SIMPLEQ_FIRST(&$5.init_nodes);
- ti != SIMPLEQ_END(&$5.init_nodes); ti = nti) {
+ for (ti = SIMPLEQ_FIRST(&$5.init_nodes); ti != NULL;
+ ti = nti) {
if (ti->file)
free(ti->file);
for (h = ti->host; h != NULL; h = nh) {
Index: sbin/pfctl/pfctl_optimize.c
===================================================================
RCS file: /cvs/src/sbin/pfctl/pfctl_optimize.c,v
retrieving revision 1.33
diff -u -p -r1.33 pfctl_optimize.c
--- sbin/pfctl/pfctl_optimize.c 22 Nov 2013 04:12:48 -0000 1.33
+++ sbin/pfctl/pfctl_optimize.c 13 Sep 2014 01:45:16 -0000
@@ -844,7 +844,7 @@ block_feedback(struct pfctl *pf, struct
break;
}
}
- if (por2 == TAILQ_END(&block->sb_rules))
+ if (por2 == NULL)
TAILQ_INSERT_TAIL(&block->sb_rules, por1, por_entry);
}
Index: sys/arch/alpha/dev/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/dev/bus_dma.c,v
retrieving revision 1.33
diff -u -p -r1.33 bus_dma.c
--- sys/arch/alpha/dev/bus_dma.c 12 Jul 2014 18:44:40 -0000 1.33
+++ sys/arch/alpha/dev/bus_dma.c 13 Sep 2014 01:45:16 -0000
@@ -511,7 +511,7 @@ _bus_dmamem_alloc_range(t, size, alignme
segs[curseg].ds_len = PAGE_SIZE;
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/arm/arm/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/bus_dma.c,v
retrieving revision 1.26
diff -u -p -r1.26 bus_dma.c
--- sys/arch/arm/arm/bus_dma.c 12 Jul 2014 18:44:41 -0000 1.26
+++ sys/arch/arm/arm/bus_dma.c 13 Sep 2014 01:45:17 -0000
@@ -1033,7 +1033,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
#endif /* DEBUG_DMA */
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/aviion/aviion/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/aviion/aviion/bus_dma.c,v
retrieving revision 1.7
diff -u -p -r1.7 bus_dma.c
--- sys/arch/aviion/aviion/bus_dma.c 12 Jul 2014 18:44:41 -0000 1.7
+++ sys/arch/aviion/aviion/bus_dma.c 13 Sep 2014 01:45:17 -0000
@@ -659,7 +659,7 @@ _bus_dmamem_alloc_range(t, size, alignme
segs[curseg].ds_len = PAGE_SIZE;
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/loongson/loongson/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/loongson/bus_dma.c,v
retrieving revision 1.15
diff -u -p -r1.15 bus_dma.c
--- sys/arch/loongson/loongson/bus_dma.c 12 Jul 2014 18:44:42 -0000
1.15
+++ sys/arch/loongson/loongson/bus_dma.c 13 Sep 2014 01:45:17 -0000
@@ -680,7 +680,7 @@ _dmamem_alloc_range(bus_dma_tag_t t, bus
segs[curseg].ds_len = PAGE_SIZE;
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/octeon/octeon/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/octeon/bus_dma.c,v
retrieving revision 1.12
diff -u -p -r1.12 bus_dma.c
--- sys/arch/octeon/octeon/bus_dma.c 12 Jul 2014 18:44:42 -0000 1.12
+++ sys/arch/octeon/octeon/bus_dma.c 13 Sep 2014 01:45:18 -0000
@@ -673,7 +673,7 @@ _dmamem_alloc_range(bus_dma_tag_t t, bus
segs[curseg].ds_len = PAGE_SIZE;
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/sgi/sgi/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/bus_dma.c,v
retrieving revision 1.37
diff -u -p -r1.37 bus_dma.c
--- sys/arch/sgi/sgi/bus_dma.c 17 Jul 2014 19:51:58 -0000 1.37
+++ sys/arch/sgi/sgi/bus_dma.c 13 Sep 2014 01:45:18 -0000
@@ -728,7 +728,7 @@ _dmamem_alloc_range(bus_dma_tag_t t, bus
segs[curseg].ds_len = PAGE_SIZE;
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/arch/vax/vax/bus_dma.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/vax/bus_dma.c,v
retrieving revision 1.29
diff -u -p -r1.29 bus_dma.c
--- sys/arch/vax/vax/bus_dma.c 12 Jul 2014 18:44:43 -0000 1.29
+++ sys/arch/vax/vax/bus_dma.c 13 Sep 2014 01:45:18 -0000
@@ -727,7 +727,7 @@ _bus_dmamem_alloc_range(t, size, alignme
#endif /* DEBUG_DMA */
m = TAILQ_NEXT(m, pageq);
- for (; m != TAILQ_END(&mlist); m = TAILQ_NEXT(m, pageq)) {
+ for (; m != NULL; m = TAILQ_NEXT(m, pageq)) {
curaddr = VM_PAGE_TO_PHYS(m);
#ifdef DIAGNOSTIC
if (curaddr < low || curaddr >= high) {
Index: sys/dev/softraid.c
===================================================================
RCS file: /cvs/src/sys/dev/softraid.c,v
retrieving revision 1.338
diff -u -p -r1.338 softraid.c
--- sys/dev/softraid.c 1 Aug 2014 01:32:09 -0000 1.338
+++ sys/dev/softraid.c 13 Sep 2014 01:45:20 -0000
@@ -1170,7 +1170,7 @@ sr_boot_assembly(struct sr_softc *sc)
SLIST_INIT(&kdh);
dk = TAILQ_FIRST(&disklist);
- while (dk != TAILQ_END(&disklist)) {
+ while (dk != NULL) {
/* See if this disk has been checked. */
SLIST_FOREACH(sdk, &sdklist, sdk_link)
@@ -1212,7 +1212,7 @@ sr_boot_assembly(struct sr_softc *sc)
/*
* Create a list of volumes and associate chunks with each volume.
*/
- for (bc = SLIST_FIRST(&bch); bc != SLIST_END(&bch); bc = bcnext) {
+ for (bc = SLIST_FIRST(&bch); bc != NULL; bc = bcnext) {
bcnext = SLIST_NEXT(bc, sbc_link);
SLIST_REMOVE(&bch, bc, sr_boot_chunk, sbc_link);
@@ -1467,10 +1467,10 @@ sr_boot_assembly(struct sr_softc *sc)
/* done with metadata */
unwind:
/* Free boot volumes and associated chunks. */
- for (bv1 = SLIST_FIRST(&bvh); bv1 != SLIST_END(&bvh); bv1 = bv2) {
+ for (bv1 = SLIST_FIRST(&bvh); bv1 != NULL; bv1 = bv2) {
bv2 = SLIST_NEXT(bv1, sbv_link);
- for (bc1 = SLIST_FIRST(&bv1->sbv_chunks);
- bc1 != SLIST_END(&bv1->sbv_chunks); bc1 = bc2) {
+ for (bc1 = SLIST_FIRST(&bv1->sbv_chunks); bc1 != NULL;
+ bc1 = bc2) {
bc2 = SLIST_NEXT(bc1, sbc_link);
if (bc1->sbc_metadata)
free(bc1->sbc_metadata, M_DEVBUF, 0);
@@ -1479,14 +1479,14 @@ unwind:
free(bv1, M_DEVBUF, 0);
}
/* Free keydisks chunks. */
- for (bc1 = SLIST_FIRST(&kdh); bc1 != SLIST_END(&kdh); bc1 = bc2) {
+ for (bc1 = SLIST_FIRST(&kdh); bc1 != NULL; bc1 = bc2) {
bc2 = SLIST_NEXT(bc1, sbc_link);
if (bc1->sbc_metadata)
free(bc1->sbc_metadata, M_DEVBUF, 0);
free(bc1, M_DEVBUF, 0);
}
/* Free unallocated chunks. */
- for (bc1 = SLIST_FIRST(&bch); bc1 != SLIST_END(&bch); bc1 = bc2) {
+ for (bc1 = SLIST_FIRST(&bch); bc1 != NULL; bc1 = bc2) {
bc2 = SLIST_NEXT(bc1, sbc_link);
if (bc1->sbc_metadata)
free(bc1->sbc_metadata, M_DEVBUF, 0);
@@ -1675,7 +1675,7 @@ sr_meta_native_attach(struct sr_discipli
/* mixed metadata versions; mark bad disks offline */
if (old_meta) {
d = 0;
- for (ch_entry = SLIST_FIRST(cl); ch_entry != SLIST_END(cl);
+ for (ch_entry = SLIST_FIRST(cl); ch_entry != NULL;
ch_entry = ch_next, d++) {
ch_next = SLIST_NEXT(ch_entry, src_link);
@@ -3782,8 +3782,7 @@ sr_chunks_unwind(struct sr_softc *sc, st
if (!cl)
return;
- for (ch_entry = SLIST_FIRST(cl);
- ch_entry != SLIST_END(cl); ch_entry = ch_next) {
+ for (ch_entry = SLIST_FIRST(cl); ch_entry != NULL; ch_entry = ch_next) {
ch_next = SLIST_NEXT(ch_entry, src_link);
DNPRINTF(SR_D_IOCTL, "%s: sr_chunks_unwind closing: %s\n",
@@ -3831,7 +3830,7 @@ sr_discipline_free(struct sr_discipline
free(sd->sd_meta_foreign, M_DEVBUF, 0);
som = &sd->sd_meta_opt;
- for (omi = SLIST_FIRST(som); omi != SLIST_END(som); omi = omi_next) {
+ for (omi = SLIST_FIRST(som); omi != NULL; omi = omi_next) {
omi_next = SLIST_NEXT(omi, omi_link);
if (omi->omi_som)
free(omi->omi_som, M_DEVBUF, 0);
Index: sys/dev/softraid_crypto.c
===================================================================
RCS file: /cvs/src/sys/dev/softraid_crypto.c,v
retrieving revision 1.110
diff -u -p -r1.110 softraid_crypto.c
--- sys/dev/softraid_crypto.c 12 Jul 2014 18:48:51 -0000 1.110
+++ sys/dev/softraid_crypto.c 13 Sep 2014 01:45:20 -0000
@@ -887,7 +887,7 @@ sr_crypto_read_key_disk(struct sr_discip
open = 0;
done:
- for (omi = SLIST_FIRST(&som); omi != SLIST_END(&som); omi = omi_next) {
+ for (omi = SLIST_FIRST(&som); omi != NULL; omi = omi_next) {
omi_next = SLIST_NEXT(omi, omi_link);
if (omi->omi_som)
free(omi->omi_som, M_DEVBUF, 0);
Index: sys/dev/ic/if_wi_hostap.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/if_wi_hostap.c,v
retrieving revision 1.44
diff -u -p -r1.44 if_wi_hostap.c
--- sys/dev/ic/if_wi_hostap.c 22 Jul 2014 13:12:12 -0000 1.44
+++ sys/dev/ic/if_wi_hostap.c 13 Sep 2014 01:45:20 -0000
@@ -287,8 +287,7 @@ wihap_shutdown(struct wi_softc *sc)
timeout_del(&whi->tmo);
/* Delete all stations from the list. */
- for (sta = TAILQ_FIRST(&whi->sta_list);
- sta != TAILQ_END(&whi->sta_list); sta = next) {
+ for (sta = TAILQ_FIRST(&whi->sta_list); sta != NULL; sta = next) {
timeout_del(&sta->tmo);
if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
printf("wihap_shutdown: free(sta=%p)\n", sta);
@@ -351,8 +350,8 @@ wihap_timeout(void *v)
s = splnet();
for (i = 10, sta = TAILQ_FIRST(&whi->sta_list);
- i != 0 && sta != TAILQ_END(&whi->sta_list) &&
- (sta->flags & WI_SIFLAGS_DEAD); i--, sta = next) {
+ i != 0 && sta != NULL && (sta->flags & WI_SIFLAGS_DEAD);
+ i--, sta = next) {
next = TAILQ_NEXT(sta, list);
if (timeout_pending(&sta->tmo)) {
/* Became alive again, move to end of list. */
Index: sys/dev/ic/qla.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/qla.c,v
retrieving revision 1.43
diff -u -p -r1.43 qla.c
--- sys/dev/ic/qla.c 13 Jul 2014 23:10:23 -0000 1.43
+++ sys/dev/ic/qla.c 13 Sep 2014 01:45:21 -0000
@@ -1964,7 +1964,7 @@ qla_do_update(void *xsc, void *x)
}
}
- if (port == TAILQ_END(&sc->sc_ports))
+ if (port == NULL)
qla_update_done(sc,
QLA_UPDATE_TASK_FABRIC_RELOGIN);
continue;
Index: sys/dev/pci/maestro.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/maestro.c,v
retrieving revision 1.37
diff -u -p -r1.37 maestro.c
--- sys/dev/pci/maestro.c 12 Jul 2014 18:48:52 -0000 1.37
+++ sys/dev/pci/maestro.c 13 Sep 2014 01:45:21 -0000
@@ -1819,7 +1819,7 @@ salloc_alloc(salloc_t pool, size_t size)
SLIST_FOREACH(zone, &pool->free, link)
if (zone->size >= size)
break;
- if (zone == SLIST_END(&pool->free))
+ if (zone == NULL)
return NULL;
if (zone->size == size) {
SLIST_REMOVE(&pool->free, zone, salloc_zone, link);
@@ -1847,7 +1847,7 @@ salloc_free(salloc_t pool, caddr_t addr)
if (zone->addr == addr)
break;
#ifdef DIAGNOSTIC
- if (zone == SLIST_END(&pool->used))
+ if (zone == NULL)
panic("salloc_free: freeing unallocated memory");
#endif
SLIST_REMOVE(&pool->used, zone, salloc_zone, link);
Index: sys/dev/pci/pci.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/pci.c,v
retrieving revision 1.103
diff -u -p -r1.103 pci.c
--- sys/dev/pci/pci.c 12 Jul 2014 18:48:52 -0000 1.103
+++ sys/dev/pci/pci.c 13 Sep 2014 01:45:21 -0000
@@ -574,8 +574,7 @@ pci_detach_devices(struct pci_softc *sc,
if (ret != 0)
return (ret);
- for (pd = LIST_FIRST(&sc->sc_devs);
- pd != LIST_END(&sc->sc_devs); pd = next) {
+ for (pd = LIST_FIRST(&sc->sc_devs); pd != NULL; pd = next) {
next = LIST_NEXT(pd, pd_next);
free(pd, M_DEVBUF, 0);
}
Index: sys/dev/pci/qle.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/qle.c,v
retrieving revision 1.31
diff -u -p -r1.31 qle.c
--- sys/dev/pci/qle.c 13 Jul 2014 23:10:23 -0000 1.31
+++ sys/dev/pci/qle.c 13 Sep 2014 01:45:22 -0000
@@ -2313,7 +2313,7 @@ qle_do_update(void *xsc, void *x)
}
}
- if (port == TAILQ_END(&sc->sc_ports))
+ if (port == NULL)
qle_update_done(sc,
QLE_UPDATE_TASK_FABRIC_RELOGIN);
continue;
Index: sys/dev/pci/drm/drm_drv.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/drm_drv.c,v
retrieving revision 1.129
diff -u -p -r1.129 drm_drv.c
--- sys/dev/pci/drm/drm_drv.c 12 Jul 2014 18:48:52 -0000 1.129
+++ sys/dev/pci/drm/drm_drv.c 13 Sep 2014 01:45:22 -0000
@@ -540,8 +540,7 @@ drmclose(dev_t kdev, int flags, int fmt,
mtx_enter(&dev->event_lock);
struct drmevlist *list = &dev->vbl_events;
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list);
- ev = evtmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = evtmp) {
evtmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;
if (ev->file_priv == file_priv) {
Index: sys/dev/pci/drm/drm_irq.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/drm_irq.c,v
retrieving revision 1.54
diff -u -p -r1.54 drm_irq.c
--- sys/dev/pci/drm/drm_irq.c 9 Mar 2014 11:07:18 -0000 1.54
+++ sys/dev/pci/drm/drm_irq.c 13 Sep 2014 01:45:23 -0000
@@ -1041,7 +1041,7 @@ void drm_vblank_off(struct drm_device *d
seq = drm_vblank_count_and_time(dev, crtc, &now);
mtx_enter(&dev->event_lock);
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list); ev = tmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = tmp) {
tmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;
@@ -1336,7 +1336,7 @@ static void drm_handle_vblank_events(str
mtx_enter(&dev->event_lock);
- for (ev = TAILQ_FIRST(list); ev != TAILQ_END(list); ev = tmp) {
+ for (ev = TAILQ_FIRST(list); ev != NULL; ev = tmp) {
tmp = TAILQ_NEXT(ev, link);
vev = (struct drm_pending_vblank_event *)ev;
Index: sys/kern/spec_vnops.c
===================================================================
RCS file: /cvs/src/sys/kern/spec_vnops.c,v
retrieving revision 1.78
diff -u -p -r1.78 spec_vnops.c
--- sys/kern/spec_vnops.c 30 Oct 2013 03:16:49 -0000 1.78
+++ sys/kern/spec_vnops.c 13 Sep 2014 01:45:23 -0000
@@ -423,8 +423,7 @@ spec_fsync(void *v)
*/
loop:
s = splbio();
- for (bp = LIST_FIRST(&vp->v_dirtyblkhd);
- bp != LIST_END(&vp->v_dirtyblkhd); bp = nbp) {
+ for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp != NULL; bp = nbp) {
nbp = LIST_NEXT(bp, b_vnbufs);
if ((bp->b_flags & B_BUSY))
continue;
Index: sys/kern/subr_extent.c
===================================================================
RCS file: /cvs/src/sys/kern/subr_extent.c,v
retrieving revision 1.52
diff -u -p -r1.52 subr_extent.c
--- sys/kern/subr_extent.c 17 Aug 2014 09:48:55 -0000 1.52
+++ sys/kern/subr_extent.c 13 Sep 2014 01:45:23 -0000
@@ -272,8 +272,7 @@ extent_destroy(struct extent *ex)
#endif
/* Free all region descriptors in extent. */
- for (rp = LIST_FIRST(&ex->ex_regions);
- rp != LIST_END(&ex->ex_regions); ) {
+ for (rp = LIST_FIRST(&ex->ex_regions); rp != NULL; ) {
orp = rp;
rp = LIST_NEXT(rp, er_link);
LIST_REMOVE(orp, er_link);
@@ -697,7 +696,7 @@ extent_do_alloc(struct extent *ex, u_lon
if (last != NULL && last->er_end >= newstart)
newstart = extent_align((last->er_end + 1), alignment, skew);
- for (; rp != LIST_END(&ex->ex_regions); rp = LIST_NEXT(rp, er_link)) {
+ for (; rp != NULL; rp = LIST_NEXT(rp, er_link)) {
/*
* If the region pasts the subend, bail out and see
* if we fit against the subend.
Index: sys/kern/sysv_sem.c
===================================================================
RCS file: /cvs/src/sys/kern/sysv_sem.c,v
retrieving revision 1.49
diff -u -p -r1.49 sysv_sem.c
--- sys/kern/sysv_sem.c 13 Jul 2014 15:29:04 -0000 1.49
+++ sys/kern/sysv_sem.c 13 Sep 2014 01:45:24 -0000
@@ -184,11 +184,11 @@ void
semundo_clear(int semid, int semnum)
{
struct sem_undo *suptr = SLIST_FIRST(&semu_list);
- struct sem_undo *suprev = SLIST_END(&semu_list);
+ struct sem_undo *suprev = NULL;
struct undo *sunptr;
int i;
- while (suptr != SLIST_END(&semu_list)) {
+ while (suptr != NULL) {
sunptr = &suptr->un_ent[0];
for (i = 0; i < suptr->un_cnt; i++, sunptr++) {
if (sunptr->un_id == semid) {
Index: sys/kern/vfs_cache.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_cache.c,v
retrieving revision 1.36
diff -u -p -r1.36 vfs_cache.c
--- sys/kern/vfs_cache.c 27 Nov 2013 15:48:43 -0000 1.36
+++ sys/kern/vfs_cache.c 13 Sep 2014 01:45:24 -0000
@@ -458,8 +458,7 @@ cache_purgevfs(struct mount *mp)
struct namecache *ncp, *nxtcp;
/* whack the regular entries */
- for (ncp = TAILQ_FIRST(&nclruhead); ncp != TAILQ_END(&nclruhead);
- ncp = nxtcp) {
+ for (ncp = TAILQ_FIRST(&nclruhead); ncp != NULL; ncp = nxtcp) {
if (ncp->nc_dvp == NULL || ncp->nc_dvp->v_mount != mp) {
nxtcp = TAILQ_NEXT(ncp, nc_lru);
continue;
@@ -470,8 +469,7 @@ cache_purgevfs(struct mount *mp)
nxtcp = TAILQ_FIRST(&nclruhead);
}
/* whack the negative entries */
- for (ncp = TAILQ_FIRST(&nclruneghead); ncp != TAILQ_END(&nclruneghead);
- ncp = nxtcp) {
+ for (ncp = TAILQ_FIRST(&nclruneghead); ncp != NULL; ncp = nxtcp) {
if (ncp->nc_dvp == NULL || ncp->nc_dvp->v_mount != mp) {
nxtcp = TAILQ_NEXT(ncp, nc_neg);
continue;
Index: sys/kern/vfs_subr.c
===================================================================
RCS file: /cvs/src/sys/kern/vfs_subr.c,v
retrieving revision 1.218
diff -u -p -r1.218 vfs_subr.c
--- sys/kern/vfs_subr.c 13 Jul 2014 15:00:40 -0000 1.218
+++ sys/kern/vfs_subr.c 13 Sep 2014 01:45:24 -0000
@@ -1887,8 +1887,7 @@ vflushbuf(struct vnode *vp, int sync)
loop:
s = splbio();
- for (bp = LIST_FIRST(&vp->v_dirtyblkhd);
- bp != LIST_END(&vp->v_dirtyblkhd); bp = nbp) {
+ for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp != NULL; bp = nbp) {
nbp = LIST_NEXT(bp, b_vnbufs);
if ((bp->b_flags & B_BUSY))
continue;
Index: sys/scsi/ses.c
===================================================================
RCS file: /cvs/src/sys/scsi/ses.c,v
retrieving revision 1.52
diff -u -p -r1.52 ses.c
--- sys/scsi/ses.c 12 Jul 2014 18:50:25 -0000 1.52
+++ sys/scsi/ses.c 13 Sep 2014 01:45:24 -0000
@@ -647,7 +647,7 @@ ses_bio_blink(struct ses_softc *sc, stru
break;
}
- if (slot == TAILQ_END(&sc->sc_slots)) {
+ if (slot == NULL) {
rw_exit_write(&sc->sc_lock);
return (EINVAL);
}
Index: usr.bin/cdio/rip.c
===================================================================
RCS file: /cvs/src/usr.bin/cdio/rip.c,v
retrieving revision 1.14
diff -u -p -r1.14 rip.c
--- usr.bin/cdio/rip.c 20 Nov 2013 20:54:34 -0000 1.14
+++ usr.bin/cdio/rip.c 13 Sep 2014 01:45:25 -0000
@@ -244,7 +244,7 @@ parse_tracks_final(struct track_pair_hea
{
struct track_pair *tp;
- while ((tp = TAILQ_FIRST(head)) != TAILQ_END(head)) {
+ while ((tp = TAILQ_FIRST(head)) != NULL) {
TAILQ_REMOVE(head, tp, list);
free(tp);
}
Index: usr.sbin/ftp-proxy/ftp-proxy.c
===================================================================
RCS file: /cvs/src/usr.sbin/ftp-proxy/ftp-proxy.c,v
retrieving revision 1.28
diff -u -p -r1.28 ftp-proxy.c
--- usr.sbin/ftp-proxy/ftp-proxy.c 15 Mar 2013 13:31:27 -0000 1.28
+++ usr.sbin/ftp-proxy/ftp-proxy.c 13 Sep 2014 01:45:26 -0000
@@ -322,7 +322,7 @@ exit_daemon(void)
{
struct session *s, *next;
- for (s = LIST_FIRST(&sessions); s != LIST_END(&sessions); s = next) {
+ for (s = LIST_FIRST(&sessions); s != NULL; s = next) {
next = LIST_NEXT(s, entry);
end_session(s);
}
Index: usr.sbin/ldapd/namespace.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/namespace.c,v
retrieving revision 1.12
diff -u -p -r1.12 namespace.c
--- usr.sbin/ldapd/namespace.c 16 Jun 2012 00:08:32 -0000 1.12
+++ usr.sbin/ldapd/namespace.c 13 Sep 2014 01:45:26 -0000
@@ -526,8 +526,8 @@ namespace_cancel_conn(struct conn *conn)
struct request *req, *next;
TAILQ_FOREACH(ns, &conf->namespaces, next) {
- for (req = TAILQ_FIRST(&ns->request_queue);
- req != TAILQ_END(&ns->request_queue); req = next) {
+ for (req = TAILQ_FIRST(&ns->request_queue); req != NULL;
+ req = next) {
next = TAILQ_NEXT(req, next);
if (req->conn == conn) {
Index: usr.sbin/ldomctl/config.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/config.c,v
retrieving revision 1.19
diff -u -p -r1.19 config.c
--- usr.sbin/ldomctl/config.c 8 May 2013 00:15:03 -0000 1.19
+++ usr.sbin/ldomctl/config.c 13 Sep 2014 01:45:27 -0000
@@ -433,7 +433,7 @@ hvmd_alloc_frag(uint64_t base)
}
}
- if (frag == TAILQ_END(&free_frags))
+ if (frag == NULL)
return -1;
TAILQ_REMOVE(&free_frags, frag, link);
Index: usr.sbin/ldomctl/mdstore.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/mdstore.c,v
retrieving revision 1.6
diff -u -p -r1.6 mdstore.c
--- usr.sbin/ldomctl/mdstore.c 24 Nov 2012 23:02:43 -0000 1.6
+++ usr.sbin/ldomctl/mdstore.c 13 Sep 2014 01:45:27 -0000
@@ -269,7 +269,7 @@ mdstore_select(struct ds_conn *dc, const
TAILQ_FOREACH(dcs, &dc->services, link)
if (strcmp(dcs->service->ds_svc_id, "mdstore") == 0)
break;
- assert(dcs != TAILQ_END(&dc->services));
+ assert(dcs != NULL);
mr = xzalloc(len);
mr->msg_type = DS_DATA;
@@ -297,7 +297,7 @@ mdstore_delete(struct ds_conn *dc, const
TAILQ_FOREACH(dcs, &dc->services, link)
if (strcmp(dcs->service->ds_svc_id, "mdstore") == 0)
break;
- assert(dcs != TAILQ_END(&dc->services));
+ assert(dcs != NULL);
mr = xzalloc(len);
mr->msg_type = DS_DATA;
@@ -335,7 +335,7 @@ mdstore_download(struct ds_conn *dc, con
TAILQ_FOREACH(dcs, &dc->services, link)
if (strcmp(dcs->service->ds_svc_id, "mdstore") == 0)
break;
- assert(dcs != TAILQ_END(&dc->services));
+ assert(dcs != NULL);
if (asprintf(&path, "%s/hv.md", name) == -1)
err(1, "asprintf");
