diff --git a/clock.c b/clock.c index fa99d86..1429838 100644 --- a/clock.c +++ b/clock.c @@ -275,7 +275,7 @@ void clock_install_fda(struct clock *c, struct port *p, struct fdarray fda) if (p == c->port[i]) break; } - for (j = 0; j < fda.cnt; j++) { + for (j = 0; j < N_POLLFD; j++) { k = N_POLLFD * i + j; c->pollfd[k].fd = fda.fd[j]; c->pollfd[k].events = POLLIN|POLLPRI; @@ -375,7 +375,7 @@ void clock_remove_fda(struct clock *c, struct port *p, struct fdarray fda) if (p == c->port[i]) break; } - for (j = 0; j < fda.cnt; j++) { + for (j = 0; j < N_POLLFD; j++) { k = N_POLLFD * i + j; c->pollfd[k].fd = -1; c->pollfd[k].events = 0; diff --git a/fd.h b/fd.h index ef068f8..f6d6cff 100644 --- a/fd.h +++ b/fd.h @@ -35,7 +35,6 @@ enum { struct fdarray { int fd[N_POLLFD]; - int cnt; }; #endif diff --git a/port.c b/port.c index 01d3c55..1362585 100644 --- a/port.c +++ b/port.c @@ -546,7 +546,6 @@ static int port_initialize(struct port *p) for (i = 0; i < N_TIMER_FDS; i++) { p->fda.fd[FD_ANNOUNCE_TIMER + i] = fd[i]; - p->fda.cnt++; } if (port_set_announce_tmo(p)) diff --git a/raw.c b/raw.c index 745b1e6..ea5e28e 100644 --- a/raw.c +++ b/raw.c @@ -190,7 +190,6 @@ static int raw_open(struct transport *t, char *name, fda->fd[FD_EVENT] = efd; fda->fd[FD_GENERAL] = gfd; - fda->cnt = 2; return 0; no_timestamping: diff --git a/udp.c b/udp.c index 4c43c11..07c6b33 100644 --- a/udp.c +++ b/udp.c @@ -149,7 +149,6 @@ static int udp_open(struct transport *t, char *name, struct fdarray *fda, fda->fd[FD_EVENT] = efd; fda->fd[FD_GENERAL] = gfd; - fda->cnt = 2; return 0; no_timestamping: