From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 22 Apr 2013 04:54:00 +0000 (+0530)
Subject: Minor cleanup in getaddrinfo
X-Git-Tag: glibc-2.18~390
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2169712d9c140d1b011470393c64258b2db3a4cd;p=thirdparty%2Fglibc.git

Minor cleanup in getaddrinfo

Replace repeated computations of alloca size with a local variable
that stores the computed value.
---

diff --git a/ChangeLog b/ChangeLog
index 0fff840f720..fffe816c046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 230928181cb..d3683066ae2 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -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.  */