Change-Id: I68cc462aeb2460345a53bdb9941ce4bfc10456fb
bionic: fix clearenv() compiler warning and related comment typos
diff --git a/libc/bionic/clearenv.c b/libc/bionic/clearenv.c
index ffc58d9..9a3b2a1 100644
--- a/libc/bionic/clearenv.c
+++ b/libc/bionic/clearenv.c
@@ -30,10 +30,10 @@
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 d78d673..dd6e027 100644
--- a/libc/bionic/libc_init_common.c
+++ b/libc/bionic/libc_init_common.c
@@ -62,7 +62,7 @@
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 682ebcf..97e80ea 100644
--- a/libc/bionic/libc_init_dynamic.c
+++ b/libc/bionic/libc_init_dynamic.c
@@ -61,7 +61,7 @@
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:
