diff options
author | Jake Burkholder <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
---|---|---|
committer | Jake Burkholder <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
commit | 740a1973a62eaa8e1dc23e22f84dacb3346d303a (patch) | |
tree | acf054a865eef37380f5ac3d3c07766b5bb234b0 /usr.sbin | |
parent | b4183771fd8ab7a5946fd38df04c1e24b1268bea (diff) | |
download | src-740a1973a62eaa8e1dc23e22f84dacb3346d303a.tar.gz src-740a1973a62eaa8e1dc23e22f84dacb3346d303a.zip |
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
Notes
Notes:
svn path=/head/; revision=60833
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/i4b/isdnd/isdnd.h | 2 | ||||
-rw-r--r-- | usr.sbin/i4b/isdnd/monitor.c | 6 | ||||
-rw-r--r-- | usr.sbin/lpr/chkprintcap/chkprintcap.c | 4 | ||||
-rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 12 | ||||
-rw-r--r-- | usr.sbin/mlxcontrol/mlxcontrol.h | 12 | ||||
-rw-r--r-- | usr.sbin/mtree/excludes.c | 4 | ||||
-rw-r--r-- | usr.sbin/pw/pw.h | 4 | ||||
-rw-r--r-- | usr.sbin/syslogd/syslogd.c | 4 | ||||
-rw-r--r-- | usr.sbin/tzsetup/tzsetup.c | 4 | ||||
-rw-r--r-- | usr.sbin/usbd/usbd.c | 4 | ||||
-rw-r--r-- | usr.sbin/ypserv/yp_dblookup.c | 4 | ||||
-rw-r--r-- | usr.sbin/ypserv/yp_dnslookup.c | 4 |
12 files changed, 32 insertions, 32 deletions
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h index 956591508d0b..24e57fa60d6c 100644 --- a/usr.sbin/i4b/isdnd/isdnd.h +++ b/usr.sbin/i4b/isdnd/isdnd.h @@ -471,7 +471,7 @@ struct rarr { #ifdef I4B_EXTERNAL_MONITOR /* for each rights entry we keep one of this structures around: */ struct monitor_rights { - TAILQ_ENTRY(monitor_rights) list; /* a list of this structures */ + TAILQ_ENTRY(struct monitor_rights) list; /* a list of this structures */ char name[FILENAME_MAX]; /* net/host spec or filename */ int rights; /* bitmask of allowed acces rights */ u_int32_t net; /* net/host address (host byte order!) */ diff --git a/usr.sbin/i4b/isdnd/monitor.c b/usr.sbin/i4b/isdnd/monitor.c index dd6d2cd036d8..79d7ed03bfc8 100644 --- a/usr.sbin/i4b/isdnd/monitor.c +++ b/usr.sbin/i4b/isdnd/monitor.c @@ -75,21 +75,21 @@ void monitor_fixup_rights() #endif -static TAILQ_HEAD(rights_q, monitor_rights) rights = TAILQ_HEAD_INITIALIZER(rights); +static TAILQ_HEAD(rights_q, struct monitor_rights) rights = TAILQ_HEAD_INITIALIZER(rights); static struct monitor_rights * local_rights = NULL; /* entry for local socket */ /* for each active monitor connection we have one of this: */ struct monitor_connection { - TAILQ_ENTRY(monitor_connection) connections; + TAILQ_ENTRY(struct monitor_connection) connections; int sock; /* socket for this connection */ int rights; /* active rights for this connection */ int events; /* bitmask of events client is interested in */ char source[FILENAME_MAX]; }; -static TAILQ_HEAD(connections_tq, monitor_connection) connections = TAILQ_HEAD_INITIALIZER(connections); +static TAILQ_HEAD(connections_tq, struct monitor_connection) connections = TAILQ_HEAD_INITIALIZER(connections); /* local prototypes */ static int cmp_rights(const struct monitor_rights *pa, const struct monitor_rights *pb); diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.c b/usr.sbin/lpr/chkprintcap/chkprintcap.c index 8b8465651e44..27ff7ca90f56 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 c7a960e8dfe4..e2bfc15e0e94 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 diff --git a/usr.sbin/mlxcontrol/mlxcontrol.h b/usr.sbin/mlxcontrol/mlxcontrol.h index f0225b5b6f88..e8f322f20c02 100644 --- a/usr.sbin/mlxcontrol/mlxcontrol.h +++ b/usr.sbin/mlxcontrol/mlxcontrol.h @@ -58,7 +58,7 @@ extern void mlx_print_phys_drv(struct mlx_phys_drv *drv, int channel, int target struct conf_phys_drv { - TAILQ_ENTRY(conf_phys_drv) pd_link; + TAILQ_ENTRY(struct conf_phys_drv) pd_link; int pd_bus; int pd_target; struct mlx_phys_drv pd_drv; @@ -66,23 +66,23 @@ struct conf_phys_drv struct conf_span { - TAILQ_ENTRY(conf_span) s_link; + TAILQ_ENTRY(struct conf_span) s_link; struct conf_phys_drv *s_drvs[8]; struct mlx_sys_drv_span s_span; }; struct conf_sys_drv { - TAILQ_ENTRY(conf_sys_drv) sd_link; + TAILQ_ENTRY(struct conf_sys_drv) sd_link; struct conf_span *sd_spans[4]; struct mlx_sys_drv sd_drv; }; struct conf_config { - TAILQ_HEAD(,conf_phys_drv) cc_phys_drvs; - TAILQ_HEAD(,conf_span) cc_spans; - TAILQ_HEAD(,conf_sys_drv) cc_sys_drvs; + TAILQ_HEAD(, struct conf_phys_drv) cc_phys_drvs; + TAILQ_HEAD(, struct conf_span) cc_spans; + TAILQ_HEAD(, struct conf_sys_drv) cc_sys_drvs; struct conf_sys_drv *cc_drives[32]; struct mlx_core_cfg cc_cfg; }; diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/mtree/excludes.c index 47ab298ab1ba..7659eec7cd68 100644 --- a/usr.sbin/mtree/excludes.c +++ b/usr.sbin/mtree/excludes.c @@ -48,11 +48,11 @@ static const char rcsid[] = * so it's OK to use a stupid algorithm. */ struct exclude { - LIST_ENTRY(exclude) link; + LIST_ENTRY(struct exclude) link; const char *glob; int pathname; }; -static LIST_HEAD(, exclude) excludes; +static LIST_HEAD(, struct exclude) excludes; void init_excludes(void) diff --git a/usr.sbin/pw/pw.h b/usr.sbin/pw/pw.h index aa437ec3cd9a..771803965fa9 100644 --- a/usr.sbin/pw/pw.h +++ b/usr.sbin/pw/pw.h @@ -66,10 +66,10 @@ struct carg { int ch; char *val; - LIST_ENTRY(carg) list; + LIST_ENTRY(struct carg) list; }; -extern LIST_HEAD(cargs, carg) arglist; +extern LIST_HEAD(cargs, struct carg) arglist; struct userconf { diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index ca5391d34e77..484b3c69817e 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -178,13 +178,13 @@ struct filed { * Queue of about-to-be dead processes we should watch out for. */ -TAILQ_HEAD(stailhead, deadq_entry) deadq_head; +TAILQ_HEAD(stailhead, struct deadq_entry) deadq_head; struct stailhead *deadq_headp; struct deadq_entry { pid_t dq_pid; int dq_timeout; - TAILQ_ENTRY(deadq_entry) dq_entries; + TAILQ_ENTRY(struct deadq_entry) dq_entries; }; /* diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index a513870c5251..45643e789dfd 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -146,12 +146,12 @@ struct country { int nzones; char *filename; /* use iff nzones < 0 */ struct continent *continent; /* use iff nzones < 0 */ - TAILQ_HEAD(, zone) zones; /* use iff nzones > 0 */ + TAILQ_HEAD(, struct zone) zones; /* use iff nzones > 0 */ dialogMenuItem *submenu; /* use iff nzones > 0 */ }; struct zone { - TAILQ_ENTRY(zone) link; + TAILQ_ENTRY(struct zone) link; char *descr; char *filename; struct continent *continent; diff --git a/usr.sbin/usbd/usbd.c b/usr.sbin/usbd/usbd.c index 06e7637bf853..899fd9552b07 100644 --- a/usr.sbin/usbd/usbd.c +++ b/usr.sbin/usbd/usbd.c @@ -143,10 +143,10 @@ typedef struct action_s { char *attach; /* commands to execute */ char *detach; - STAILQ_ENTRY(action_s) next; + STAILQ_ENTRY(struct action_s) next; } action_t; -STAILQ_HEAD(action_list, action_s) actions = STAILQ_HEAD_INITIALIZER(actions); +STAILQ_HEAD(action_list, struct action_s) actions = STAILQ_HEAD_INITIALIZER(actions); typedef struct action_match_s { action_t *action; diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c index f558b0534683..a9ce0ceb6cac 100644 --- a/usr.sbin/ypserv/yp_dblookup.c +++ b/usr.sbin/ypserv/yp_dblookup.c @@ -79,11 +79,11 @@ struct dbent { int flags; }; -static CIRCLEQ_HEAD(circlehead, circleq_entry) qhead; +static CIRCLEQ_HEAD(circlehead, struct circleq_entry) qhead; struct circleq_entry { struct dbent *dbptr; - CIRCLEQ_ENTRY(circleq_entry) links; + CIRCLEQ_ENTRY(struct circleq_entry) links; }; /* diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c index 3a62694033ae..1ef76aa114cf 100644 --- a/usr.sbin/ypserv/yp_dnslookup.c +++ b/usr.sbin/ypserv/yp_dnslookup.c @@ -105,7 +105,7 @@ static char *parse(hp) extern struct hostent *__dns_getanswer __P((char *, int, char *, int)); -static CIRCLEQ_HEAD(dns_qhead, circleq_dnsentry) qhead; +static CIRCLEQ_HEAD(dns_qhead, struct circleq_dnsentry) qhead; struct circleq_dnsentry { SVCXPRT *xprt; @@ -119,7 +119,7 @@ struct circleq_dnsentry { char **domain; char *name; struct in_addr addr; - CIRCLEQ_ENTRY(circleq_dnsentry) links; + CIRCLEQ_ENTRY(struct circleq_dnsentry) links; }; static int pending = 0; |