diff options
author | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
---|---|---|
committer | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
commit | d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 (patch) | |
tree | a4f130be4544ce7cfe4afa8c93f996b871433cb8 /usr.sbin/lpr | |
parent | e814d2a0db522b0f163eef55a56d05aa226951f3 (diff) | |
download | FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.zip FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.tar.gz |
Change the way that the queue(3) structures are declared; don't assume that
the type argument to *_HEAD and *_ENTRY is a struct.
Suggested by: phk
Reviewed by: phk
Approved by: mdodd
Diffstat (limited to 'usr.sbin/lpr')
-rw-r--r-- | usr.sbin/lpr/chkprintcap/chkprintcap.c | 4 | ||||
-rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c index 8b84656..27ff7ca 100644 --- a/usr.sbin/lpr/chkprintcap/chkprintcap.c +++ b/usr.sbin/lpr/chkprintcap/chkprintcap.c @@ -152,13 +152,13 @@ interpret_error(const struct printer *pp, int error) * a single loop. */ struct dirlist { - LIST_ENTRY(dirlist) link; + LIST_ENTRY(struct dirlist) link; struct stat stab; char *path; char *printer; }; -static LIST_HEAD(, dirlist) dirlist; +static LIST_HEAD(, struct dirlist) dirlist; static int lessp(const struct dirlist *a, const struct dirlist *b) diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index c7a960e..e2bfc15 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -91,24 +91,24 @@ struct printer { * reversed in process. */ struct req_user { - TAILQ_ENTRY(req_user) ru_link; /* macro glue */ + TAILQ_ENTRY(struct req_user) ru_link; /* macro glue */ char ru_uname[1]; /* name of user */ }; -TAILQ_HEAD(req_user_head, req_user); +TAILQ_HEAD(req_user_head, struct req_user); struct req_file { - TAILQ_ENTRY(req_file) rf_link; /* macro glue */ + TAILQ_ENTRY(struct req_file) rf_link; /* macro glue */ char rf_type; /* type (lowercase cf file letter) of file */ char *rf_prettyname; /* user-visible name of file */ char rf_fname[1]; /* name of file */ }; -TAILQ_HEAD(req_file_head, req_file); +TAILQ_HEAD(req_file_head, struct req_file); struct req_jobid { - TAILQ_ENTRY(req_jobid) rj_link; /* macro glue */ + TAILQ_ENTRY(struct req_jobid) rj_link; /* macro glue */ int rj_job; /* job number */ }; -TAILQ_HEAD(req_jobid_head, req_jobid); +TAILQ_HEAD(req_jobid_head, struct req_jobid); /* * Encapsulate all the information relevant to a request in the |