diff options
Diffstat (limited to 'usr.sbin/lpr')
| -rw-r--r-- | usr.sbin/lpr/chkprintcap/chkprintcap.c | 10 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/request.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c index 8b84656..405a112 100644 --- a/usr.sbin/lpr/chkprintcap/chkprintcap.c +++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c @@ -193,10 +193,10 @@ note_spool_dir(const struct printer *pp, const struct stat *st) err(++problems, "malloc(%lu)", strlen(pp->spool_dir) + 1UL); last = 0; - dp2 = dirlist.lh_first; - while (dp2 && lessp(dp, dp2)) { + LIST_FOREACH(dp2, &dirlist, link) { + if(!lessp(dp, dp2)) + break; last = dp2; - dp2 = dp2->link.le_next; } if (last) { @@ -211,8 +211,8 @@ check_spool_dirs(void) { struct dirlist *dp, *dp2; - for (dp = dirlist.lh_first; dp; dp = dp2) { - dp2 = dp->link.le_next; + for (dp = LIST_FIRST(&dirlist); dp; dp = dp2) { + dp2 = LIST_NEXT(dp, link); if (dp2 != 0 && equal(dp, dp2)) { ++problems; diff --git a/usr.sbin/lpr/common_source/request.c b/usr.sbin/lpr/common_source/request.c index e3e4366..79ea90b 100644 --- a/usr.sbin/lpr/common_source/request.c +++ b/usr.sbin/lpr/common_source/request.c @@ -68,11 +68,11 @@ free_request(struct request *rp) free(rp->prettyname); if (rp->authinfo) free(rp->authinfo); - while ((ru = rp->users.tqh_first) != 0) { + while ((ru = TAILQ_FIRST(&rp->users)) != 0) { TAILQ_REMOVE(&rp->users, ru, ru_link); free(ru); } - while ((rj = rp->jobids.tqh_first) != 0) { + while ((rj = TAILQ_FIRST(&rp->jobids)) != 0) { TAILQ_REMOVE(&rp->jobids, rj, rj_link); free(rj); } |
