From 2bf607d599b703604cb1caf5beeb2e70c44682fb Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterso@cpeterso.com>
Date: Sun, 27 Jun 2010 20:53:04 -0700
Subject: [PATCH] Change-Id: I68cc462aeb2460345a53bdb9941ce4bfc10456fb bionic:
fix clearenv() compiler warning and related comment typos
---
libc/bionic/clearenv.c | 8 ++++----
libc/bionic/libc_init_common.c | 2 +-
libc/bionic/libc_init_dynamic.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libc/bionic/clearenv.c b/libc/bionic/clearenv.c
index ffc58d9fe..9a3b2a1d9 100644
--- a/libc/bionic/clearenv.c
+++ b/libc/bionic/clearenv.c
@@ -30,10 +30,10 @@ extern char** environ;
int clearenv(void)
{
- char **P = environ;
- int offset;
+ char **P;
- for (P = &environ[offset]; *P; ++P)
+ for (P = environ; *P; ++P)
*P = 0;
- return 0;
+
+ return 0;
}
diff --git a/libc/bionic/libc_init_common.c b/libc/bionic/libc_init_common.c
index d78d673f0..dd6e027f8 100644
--- a/libc/bionic/libc_init_common.c
+++ b/libc/bionic/libc_init_common.c
@@ -62,7 +62,7 @@ void __libc_init_common(uintptr_t *elfdata)
static pthread_internal_t thread;
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 stacksize = 128 * 1024;
unsigned stackbottom = stacktop - stacksize;
diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c
index 682ebcfd3..97e80eaec 100644
--- a/libc/bionic/libc_init_dynamic.c
+++ b/libc/bionic/libc_init_dynamic.c
@@ -61,7 +61,7 @@ void __attribute__((constructor)) __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.
*
* Note that: