svn commit: trunk/uClibc: ldso/ldso libc/misc/internals libc/misc/ etc...
psm at uclibc.org
psm at uclibc.org
Fri Jan 27 17:50:54 UTC 2006
Author: psm
Date: 2006-01-27 09:50:52 -0800 (Fri, 27 Jan 2006)
New Revision: 13639
Log:
Some warnings go away
Modified:
trunk/uClibc/ldso/ldso/ldso.c
trunk/uClibc/libc/misc/internals/__uClibc_main.c
trunk/uClibc/libc/misc/time/time.c
trunk/uClibc/libc/stdlib/abort.c
Changeset:
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c 2006-01-27 15:45:56 UTC (rev 13638)
+++ trunk/uClibc/ldso/ldso/ldso.c 2006-01-27 17:50:52 UTC (rev 13639)
@@ -88,6 +88,7 @@
#ifdef __UCLIBC_HAS_SSP__
#include <dl-osinfo.h>
+uintptr_t stack_chk_guard;
#ifndef THREAD_SET_STACK_GUARD
/* Only exported for architectures that don't store the stack guard canary
* in local thread area. */
@@ -212,7 +213,7 @@
/* sjhill: your TLS init should go before this */
#ifdef __UCLIBC_HAS_SSP__
/* Set up the stack checker's canary. */
- uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard ();
+ stack_chk_guard = _dl_setup_stack_chk_guard ();
# ifdef THREAD_SET_STACK_GUARD
THREAD_SET_STACK_GUARD (stack_chk_guard);
# else
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c 2006-01-27 15:45:56 UTC (rev 13638)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c 2006-01-27 17:50:52 UTC (rev 13639)
@@ -57,6 +57,7 @@
/* Only exported for architectures that don't store the stack guard canary
* in thread local area. */
#include <stdint.h>
+uintptr_t stack_chk_guard;
/* for gcc-4.1 non-TLS */
uintptr_t __stack_chk_guard attribute_relro;
/* for gcc-3.x + Etoh ssp */
@@ -186,7 +187,7 @@
#ifndef SHARED
# ifdef __UCLIBC_HAS_SSP__
/* Set up the stack checker's canary. */
- uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard();
+ stack_chk_guard = _dl_setup_stack_chk_guard();
# ifdef THREAD_SET_STACK_GUARD
THREAD_SET_STACK_GUARD (stack_chk_guard);
# else
Modified: trunk/uClibc/libc/misc/time/time.c
===================================================================
--- trunk/uClibc/libc/misc/time/time.c 2006-01-27 15:45:56 UTC (rev 13638)
+++ trunk/uClibc/libc/misc/time/time.c 2006-01-27 17:50:52 UTC (rev 13639)
@@ -475,21 +475,21 @@
/**********************************************************************/
#ifdef L_ctime
-char *ctime(const time_t *clock)
+char *ctime(const time_t *t)
{
/* ANSI/ISO/SUSv3 say that ctime is equivalent to the following. */
- return asctime(localtime(clock));
+ return asctime(localtime(t));
}
libc_hidden_def(ctime)
#endif
/**********************************************************************/
#ifdef L_ctime_r
-char *ctime_r(const time_t *clock, char *buf)
+char *ctime_r(const time_t *t, char *buf)
{
struct tm xtm;
- return asctime_r(localtime_r(clock, &xtm), buf);
+ return asctime_r(localtime_r(t, &xtm), buf);
}
#endif
Modified: trunk/uClibc/libc/stdlib/abort.c
===================================================================
--- trunk/uClibc/libc/stdlib/abort.c 2006-01-27 15:45:56 UTC (rev 13638)
+++ trunk/uClibc/libc/stdlib/abort.c 2006-01-27 17:50:52 UTC (rev 13639)
@@ -59,14 +59,14 @@
/* Cause an abnormal program termination with core-dump */
void abort(void)
{
- sigset_t sigset;
+ sigset_t sigs;
/* Make sure we acquire the lock before proceeding */
LOCK;
/* Unmask SIGABRT to be sure we can get it */
- if (__sigemptyset(&sigset) == 0 && __sigaddset(&sigset, SIGABRT) == 0) {
- sigprocmask(SIG_UNBLOCK, &sigset, (sigset_t *) NULL);
+ if (__sigemptyset(&sigs) == 0 && __sigaddset(&sigs, SIGABRT) == 0) {
+ sigprocmask(SIG_UNBLOCK, &sigs, (sigset_t *) NULL);
}
while (1) {
@@ -77,7 +77,7 @@
#ifdef __UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT__
/* If we are using stdio, try to shut it down. At the very least,
* this will attempt to commit all buffered writes. It may also
- * unboffer all writable files, or close them outright.
+ * unbuffer all writable files, or close them outright.
* Check the stdio routines for details. */
if (_stdio_term) {
_stdio_term();
More information about the uClibc-cvs
mailing list