28c28
< __FBSDID("$FreeBSD: projects/jailconf/usr.sbin/jail/config.c 214783 2010-11-04 17:01:21Z jamie $");
---
> __FBSDID("$FreeBSD: projects/jailconf/usr.sbin/jail/config.c 223188 2011-06-17 16:06:13Z jamie $");
181c181
< STAILQ_FOREACH(s, &p->val, tq) {
---
> TAILQ_FOREACH(s, &p->val, tq) {
205c205
< STAILQ_FOREACH(vs, &vp->val, tq)
---
> TAILQ_FOREACH(vs, &vp->val, tq)
214,215c214,215
< vs = STAILQ_FIRST(&vp->val);
< if (STAILQ_NEXT(vs, tq) != NULL &&
---
> vs = TAILQ_FIRST(&vp->val);
> if (TAILQ_NEXT(vs, tq) != NULL &&
230c230
< while ((vs = STAILQ_NEXT(vs, tq))) {
---
> while ((vs = TAILQ_NEXT(vs, tq))) {
235c235
< STAILQ_INSERT_AFTER(&p->val, s, ns, tq);
---
> TAILQ_INSERT_AFTER(&p->val, s, ns, tq);
301c301
< STAILQ_INIT(&nss);
---
> TAILQ_INIT(&nss);
309c309
< STAILQ_FOREACH(s, &p->val, tq) {
---
> TAILQ_FOREACH(s, &p->val, tq) {
320c320
< STAILQ_INSERT_TAIL(&nss, ns, tq);
---
> TAILQ_INSERT_TAIL(&nss, ns, tq);
341c341
< STAILQ_INSERT_TAIL(&nss, ns, tq);
---
> TAILQ_INSERT_TAIL(&nss, ns, tq);
358c358
< if (!(flags & PF_APPEND) || STAILQ_EMPTY(&nss))
---
> if (!(flags & PF_APPEND) || TAILQ_EMPTY(&nss))
360c360
< STAILQ_CONCAT(&dp->val, &nss);
---
> TAILQ_CONCAT(&dp->val, &nss, tq);
366,367c366,367
< STAILQ_INIT(&np->val);
< STAILQ_CONCAT(&np->val, &nss);
---
> TAILQ_INIT(&np->val);
> TAILQ_CONCAT(&np->val, &nss, tq);
396,398c396,398
< (STAILQ_EMPTY(&p->val) ||
< !strcasecmp(STAILQ_LAST(&p->val, cfstring, tq)->s, "true") ||
< (strtol(STAILQ_LAST(&p->val, cfstring, tq)->s, NULL, 10)));
---
> (TAILQ_EMPTY(&p->val) ||
> !strcasecmp(TAILQ_LAST(&p->val, cfstrings)->s, "true") ||
> (strtol(TAILQ_LAST(&p->val, cfstrings)->s, NULL, 10)));
407c407
< if (p == NULL || STAILQ_EMPTY(&p->val))
---
> if (p == NULL || TAILQ_EMPTY(&p->val))
409c409
< *ip = strtol(STAILQ_LAST(&p->val, cfstring, tq)->s, NULL, 10);
---
> *ip = strtol(TAILQ_LAST(&p->val, cfstrings)->s, NULL, 10);
419,420c419,420
< return (p && !STAILQ_EMPTY(&p->val)
< ? STAILQ_LAST(&p->val, cfstring, tq)->s : NULL);
---
> return (p && !TAILQ_EMPTY(&p->val)
> ? TAILQ_LAST(&p->val, cfstrings)->s : NULL);
451,453c451,452
< if (!STAILQ_EMPTY(&p->val) &&
< (p->flags & (PF_BOOL | PF_INT))) {
< val = STAILQ_LAST(&p->val, cfstring, tq)->s;
---
> if (!TAILQ_EMPTY(&p->val) && (p->flags & (PF_BOOL | PF_INT))) {
> val = TAILQ_LAST(&p->val, cfstrings)->s;
568c567
< STAILQ_FOREACH(s, &j->intparams[KP_IP4_ADDR + isip6]->val, tq) {
---
> TAILQ_FOREACH(s, &j->intparams[KP_IP4_ADDR + isip6]->val, tq) {
613c612
< STAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) {
---
> TAILQ_FOREACH(s, &j->intparams[IP_MOUNT_FSTAB]->val, tq) {
671c670
< if (STAILQ_EMPTY(&p->val))
---
> if (TAILQ_EMPTY(&p->val))
674c673
< !STAILQ_NEXT(STAILQ_FIRST(&p->val), tq)) {
---
> !TAILQ_NEXT(TAILQ_FIRST(&p->val), tq)) {
681c680
< value = STAILQ_LAST(&p->val, cfstring, tq)->s;
---
> value = TAILQ_LAST(&p->val, cfstrings)->s;
688c687
< STAILQ_FOREACH(s, &p->val, tq)
---
> TAILQ_FOREACH(s, &p->val, tq)
692c691
< STAILQ_FOREACH_SAFE(s, &p->val, tq, ts) {
---
> TAILQ_FOREACH_SAFE(s, &p->val, tq, ts) {
799c798
< while ((s = STAILQ_FIRST(&p->val))) {
---
> while ((s = TAILQ_FIRST(&p->val))) {
806c805
< STAILQ_REMOVE_HEAD(&p->val, tq);
---
> TAILQ_REMOVE(&p->val, s, tq);