diff options
| author | phk <phk@FreeBSD.org> | 2000-12-30 21:05:45 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2000-12-30 21:05:45 +0000 |
| commit | 012b3e6f2040d83c0336346be7483454fa3924e0 (patch) | |
| tree | daac72cf76064b2b74b3bedf2cb122ce5c819912 /sbin/fsck | |
| parent | 7fd96a9db33fa7d84ed0b1bc4e57a4d42268145a (diff) | |
| download | FreeBSD-src-012b3e6f2040d83c0336346be7483454fa3924e0.zip FreeBSD-src-012b3e6f2040d83c0336346be7483454fa3924e0.tar.gz | |
Use macro API to <sys/queue.h>
Submitted by: "Peter Avalos" <pavalos@theshell.com>
Reviewed by: /sbin/md5
Diffstat (limited to 'sbin/fsck')
| -rw-r--r-- | sbin/fsck/fsck.c | 8 | ||||
| -rw-r--r-- | sbin/fsck/preen.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 84fcdf1..2eb26a0 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -141,7 +141,7 @@ main(argc, argv) break; case 't': - if (selhead.tqh_first != NULL) + if (!TAILQ_EMPTY(&selhead)) errx(1, "only one -t option may be specified."); maketypelist(optarg); @@ -350,7 +350,7 @@ selected(type) struct entry *e; /* If no type specified, it's always selected. */ - for (e = selhead.tqh_first; e != NULL; e = e->entries.tqe_next) + TAILQ_FOREACH(e, &selhead, entries) if (!strncmp(e->type, type, MFSNAMELEN)) return which == IN_LIST ? 1 : 0; @@ -364,7 +364,7 @@ getoptions(type) { struct entry *e; - for (e = opthead.tqh_first; e != NULL; e = e->entries.tqe_next) + TAILQ_FOREACH(e, &opthead, entries) if (!strncmp(e->type, type, MFSNAMELEN)) return e->options; return ""; @@ -383,7 +383,7 @@ addoption(optstr) *newoptions++ = '\0'; - for (e = opthead.tqh_first; e != NULL; e = e->entries.tqe_next) + TAILQ_FOREACH(e, &opthead, entries) if (!strncmp(e->type, optstr, MFSNAMELEN)) { catopt(&e->options, newoptions); return; diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index e00e84e..3beda3e 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -230,7 +230,7 @@ checkfstab(flags, maxrun, docheck, checkit) } } if (sumstatus) { - p = badh.tqh_first; + p = TAILQ_FIRST(&badh); if (p == NULL) return (sumstatus); @@ -334,7 +334,7 @@ startdisk(d, checkit) int (*checkit) __P((const char *, const char *, const char *, void *, pid_t *)); { - struct partentry *p = d->d_part.tqh_first; + struct partentry *p = TAILQ_FIRST(&d->d_part); int rv; while ((rv = (*checkit)(p->p_type, p->p_devname, p->p_mntpt, |
