qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace an alloca use with a variable-length array.

This commit is contained in:
Roland McGrath 2013-02-05 12:15:56 -08:00
parent b2e25af00c
commit 573c29b288
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2013-02-05 Roland McGrath <roland@hack.frob.com> 2013-02-05 Roland McGrath <roland@hack.frob.com>
* elf/dl-hwcaps.c (_dl_important_hwcaps): Use a variable-length array
instead of calling alloca.
* io/lseek.c (__lseek): Rename to __libc_lseek. * io/lseek.c (__lseek): Rename to __libc_lseek.
Define __lseek as an alias. Define __lseek as an alias.

5
elf/dl-hwcaps.c
View File

@ -42,7 +42,6 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
size_t cnt = platform != NULL; size_t cnt = platform != NULL;
size_t n, m; size_t n, m;
size_t total; size_t total;
struct r_strlenpair *temp;
struct r_strlenpair *result; struct r_strlenpair *result;
struct r_strlenpair *rp; struct r_strlenpair *rp;
char *cp; char *cp;
@ -103,7 +102,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
++cnt; ++cnt;
/* Create temporary data structure to generate result table. */ /* Create temporary data structure to generate result table. */
temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp)); struct r_strlenpair temp[cnt];
m = 0; m = 0;
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
if (dsocaps != NULL) if (dsocaps != NULL)
@ -199,7 +198,7 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
} }
/* Fill in the information. This follows the following scheme /* Fill in the information. This follows the following scheme
(indeces from TEMP for four strings): (indices from TEMP for four strings):
entry #0: 0, 1, 2, 3 binary: 1111 entry #0: 0, 1, 2, 3 binary: 1111
#1: 0, 1, 3 1101 #1: 0, 1, 3 1101
#2: 0, 2, 3 1011 #2: 0, 2, 3 1011