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

Fix warnings due to return in void functions

This commit is contained in:
Ulrich Drepper 2012-01-11 11:56:30 -05:00
parent daa891c0e8
commit 5452bffeef
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nptl/ChangeLog
View File

@ -1,3 +1,9 @@
2012-01-11 Marek Polacek <polacek@redhat.com>
* forward.c (FORWARD_NORETURN): Define macro.
(__pthread_unwind): Use FORWARD_NORETURN macro to avoid warning.
(__pthread_exit): Likewise.
2012-01-10 Ulrich Drepper <drepper@gmail.com> 2012-01-10 Ulrich Drepper <drepper@gmail.com>
* sysdeps/pthread/pthread.h: Add const attribute to pthread_equal. * sysdeps/pthread/pthread.h: Add const attribute to pthread_equal.

21
nptl/forward.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003, 2004, 2007, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -42,6 +42,17 @@ name decl \
return PTHFCT_CALL (ptr_##name, params); \ return PTHFCT_CALL (ptr_##name, params); \
} }
/* Same as FORWARD2, only without return. */
#define FORWARD_NORETURN(name, rettype, decl, params, defaction) \
rettype \
name decl \
{ \
if (!__libc_pthread_functions_init) \
defaction; \
\
PTHFCT_CALL (ptr_##name, params); \
}
#define FORWARD(name, decl, params, defretval) \ #define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval) FORWARD2 (name, int, decl, params, return defretval)
@ -160,8 +171,8 @@ FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2),
(thread1, thread2), 1) (thread1, thread2), 1)
/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
FORWARD2 (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) exit (EXIT_SUCCESS))
strong_alias (__pthread_exit, pthread_exit); strong_alias (__pthread_exit, pthread_exit);
@ -192,8 +203,7 @@ FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0) FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
#define return /* value is void */ FORWARD_NORETURN(__pthread_unwind,
FORWARD2(__pthread_unwind,
void attribute_hidden __attribute ((noreturn)) __cleanup_fct_attribute void attribute_hidden __attribute ((noreturn)) __cleanup_fct_attribute
attribute_compat_text_section, attribute_compat_text_section,
(__pthread_unwind_buf_t *buf), (buf), { (__pthread_unwind_buf_t *buf), (buf), {
@ -201,4 +211,3 @@ FORWARD2(__pthread_unwind,
INTERNAL_SYSCALL_DECL (err); INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (kill, err, 1, SIGKILL); INTERNAL_SYSCALL (kill, err, 1, SIGKILL);
}) })
#undef return