aboutsummaryrefslogtreecommitdiff
path: root/nis/nis_callback.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-20 00:31:17 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-20 00:31:17 +0000
commit101cc59887f30651022b57f00200e5528990d190 (patch)
tree6a2a11d1041731d94d223ec9d7a5aa67b91440a0 /nis/nis_callback.c
parentf50fa10c8ac99e0efdca8469c646a08dd2cdefe2 (diff)
downloadglibc-101cc59887f30651022b57f00200e5528990d190.zip
glibc-101cc59887f30651022b57f00200e5528990d190.tar.gz
glibc-101cc59887f30651022b57f00200e5528990d190.tar.bz2
* nis/nis_callback.c (internal_nis_do_callback): Don't use malloc
to allocate memory for my_pollfd. Better initialization of cb_is_running. Use TEMP_FAILURE_RETRY.
Diffstat (limited to 'nis/nis_callback.c')
-rw-r--r--nis/nis_callback.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index 6582315..7c76f99 100644
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -197,22 +197,18 @@ internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
struct nis_cb *cb)
{
struct timeval TIMEOUT = {25, 0};
- bool_t cb_is_running = FALSE;
+ bool_t cb_is_running;
data = cb;
for (;;)
{
- struct pollfd *my_pollfd;
+ struct pollfd my_pollfd[svc_max_pollfd];
int i;
if (svc_max_pollfd == 0 && svc_pollfd == NULL)
return NIS_CBERROR;
- my_pollfd = malloc (sizeof (struct pollfd) * svc_max_pollfd);
- if (__builtin_expect (my_pollfd == NULL, 0))
- return NIS_NOMEMORY;
-
for (i = 0; i < svc_max_pollfd; ++i)
{
my_pollfd[i].fd = svc_pollfd[i].fd;
@@ -220,20 +216,17 @@ internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
my_pollfd[i].revents = 0;
}
- switch (i = __poll (my_pollfd, svc_max_pollfd, 25*1000))
+ switch (i = TEMP_FAILURE_RETRY (__poll (my_pollfd, svc_max_pollfd,
+ 25*1000)))
{
case -1:
- free (my_pollfd);
- if (errno == EINTR)
- continue;
return NIS_CBERROR;
case 0:
- free (my_pollfd);
/* See if callback 'thread' in the server is still alive. */
- memset ((char *) &cb_is_running, 0, sizeof (cb_is_running));
+ cb_is_running = FALSE;
if (clnt_call (bptr->clnt, NIS_CALLBACK, (xdrproc_t) xdr_netobj,
(caddr_t) cookie, (xdrproc_t) xdr_bool,
- (caddr_t) & cb_is_running, TIMEOUT) != RPC_SUCCESS)
+ (caddr_t) &cb_is_running, TIMEOUT) != RPC_SUCCESS)
cb_is_running = FALSE;
if (cb_is_running == FALSE)
@@ -244,7 +237,6 @@ internal_nis_do_callback (struct dir_binding *bptr, netobj *cookie,
break;
default:
svc_getreq_poll (my_pollfd, i);
- free (my_pollfd);
if (data->nomore)
return data->result;
}