From: Frank Lahm Date: Mon, 30 Apr 2012 11:00:45 +0000 (+0200) Subject: Add POLLNVAL to the set of poll revents X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=db81840598a64931a93fa0477e40eeaa6717f9cb;hp=c5dd04aaa5761ec04fc89e73b27c608c90ec14f0 Add POLLNVAL to the set of poll revents --- diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 550a809f..5b79c08d 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -412,7 +412,7 @@ int main(int ac, char **av) } for (int i = 0; i < fdset_used; i++) { - if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP)) { + if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) { switch (polldata[i].fdtype) { case LISTEN_FD: diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c index b4bc3542..c87417d5 100644 --- a/libatalk/util/server_child.c +++ b/libatalk/util/server_child.c @@ -199,7 +199,6 @@ void server_child_free(server_child *children) server_child_fork *fork; struct server_child_data *child, *tmp; int i, j; - pid_t pid = getpid(); for (i = 0; i < children->nforks; i++) { fork = (server_child_fork *) children->fork + i;