Merge "Change-Id: I68cc462aeb2460345a53bdb9941ce4bfc10456fb bionic: fix clearenv() compiler warning and related comment typos"

This commit is contained in:
Jean-Baptiste Queru 2010-07-08 15:38:13 -07:00 committed by Android Code Review
commit fc6d95b10e
3 changed files with 6 additions and 6 deletions

View File

@ -30,10 +30,10 @@ extern char** environ;
int clearenv(void) int clearenv(void)
{ {
char **P = environ; char **P;
int offset;
for (P = &environ[offset]; *P; ++P) for (P = environ; *P; ++P)
*P = 0; *P = 0;
return 0;
return 0;
} }

View File

@ -62,7 +62,7 @@ void __libc_init_common(uintptr_t *elfdata)
static pthread_internal_t thread; static pthread_internal_t thread;
static void* tls_area[BIONIC_TLS_SLOTS]; static void* tls_area[BIONIC_TLS_SLOTS];
/* setup pthread runtime and maint thread descriptor */ /* setup pthread runtime and main thread descriptor */
unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE; unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE;
unsigned stacksize = 128 * 1024; unsigned stacksize = 128 * 1024;
unsigned stackbottom = stacktop - stacksize; unsigned stackbottom = stacktop - stacksize;

View File

@ -61,7 +61,7 @@ void __attribute__((constructor)) __libc_prenit(void);
void __libc_prenit(void) void __libc_prenit(void)
{ {
/* Read the ELF data pointer form a special slot of the /* Read the ELF data pointer from a special slot of the
* TLS area, then call __libc_init_common with it. * TLS area, then call __libc_init_common with it.
* *
* Note that: * Note that: