Minor cleanup in getaddrinfo

Replace repeated computations of alloca size with a local variable
that stores the computed value.
This commit is contained in:
Siddhesh Poyarekar 2013-04-22 10:24:00 +05:30
parent 29c5de9984
commit 2169712d9c
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2013-04-22 Siddhesh Poyarekar <siddhesh@redhat.com>
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Compute results
size just once.
2013-04-21 David S. Miller <davem@davemloft.net>
* po/ru.po: Update Russion translation from translation project.

View File

@ -2495,12 +2495,13 @@ getaddrinfo (const char *name, const char *service,
struct addrinfo *last = NULL;
char *canonname = NULL;
bool malloc_results;
size_t alloc_size = nresults * (sizeof (*results) + sizeof (size_t));
malloc_results
= !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
= !__libc_use_alloca (alloc_size);
if (malloc_results)
{
results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
results = malloc (alloc_size);
if (results == NULL)
{
__free_in6ai (in6ai);
@ -2508,7 +2509,7 @@ getaddrinfo (const char *name, const char *service,
}
}
else
results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
results = alloca (alloc_size);
order = (size_t *) (results + nresults);
/* Now we definitely need the interface information. */