diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-11 19:57:06 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-12 17:09:25 -0800 |
| commit | aa0ebdafc71e1ceac78e0929b94f3bb117d0c8e9 (patch) | |
| tree | e0fa3c926172fbc3e4b1a43950ae2a7ea662deb7 /libc/bionic | |
| parent | 9e572ca4163e42bcd053df2cb8557e4b61ad064d (diff) | |
| download | android_bionic-aa0ebdafc71e1ceac78e0929b94f3bb117d0c8e9.tar.gz android_bionic-aa0ebdafc71e1ceac78e0929b94f3bb117d0c8e9.tar.bz2 android_bionic-aa0ebdafc71e1ceac78e0929b94f3bb117d0c8e9.zip | |
Clean up sys_signame and sys_siglist a little.
We don't need quite so much duplication because we already have a way
to get the signal number from its name, and that already copes with the
fact that the mips/mips64 numbers are different from everyone else's.
Also remove sys_signame from LP64. glibc doesn't have this BSD-ism.
Change-Id: I6dc411a3d73589383c85d3b07d9d648311492a10
Diffstat (limited to 'libc/bionic')
| -rw-r--r-- | libc/bionic/strerror_r.cpp | 2 | ||||
| -rw-r--r-- | libc/bionic/sys_siglist.c (renamed from libc/bionic/siglist.c) | 5 | ||||
| -rw-r--r-- | libc/bionic/sys_signame.c (renamed from libc/bionic/signame.c) | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libc/bionic/strerror_r.cpp b/libc/bionic/strerror_r.cpp index 81120ecd3..5f2d36214 100644 --- a/libc/bionic/strerror_r.cpp +++ b/libc/bionic/strerror_r.cpp @@ -34,7 +34,7 @@ extern "C" __LIBC_HIDDEN__ const char* __strerror_lookup(int error_number) { } static const Pair _sys_signal_strings[] = { -#define __BIONIC_SIGDEF(x,y,z) { y, z }, +#define __BIONIC_SIGDEF(signal_number, signal_description) { signal_number, signal_description }, #include <sys/_sigdefs.h> { 0, NULL } }; diff --git a/libc/bionic/siglist.c b/libc/bionic/sys_siglist.c index f1c337785..3cfddbfc4 100644 --- a/libc/bionic/siglist.c +++ b/libc/bionic/sys_siglist.c @@ -25,9 +25,10 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include <signal.h> -const char * const sys_siglist[NSIG] = { -#define __BIONIC_SIGDEF(x,y,z) [ SIG##x ] = z, +const char* const sys_siglist[NSIG] = { +#define __BIONIC_SIGDEF(signal_number, signal_description) [ signal_number ] = signal_description, #include <sys/_sigdefs.h> }; diff --git a/libc/bionic/signame.c b/libc/bionic/sys_signame.c index 4611e4448..41d34af83 100644 --- a/libc/bionic/signame.c +++ b/libc/bionic/sys_signame.c @@ -25,9 +25,14 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include <signal.h> -const char * const sys_signame[NSIG] = { -#define __BIONIC_SIGDEF(x,y,z) [ SIG##x ] = #x, +#if !defined(__LP64__) + +const char* const sys_signame[NSIG] = { +#define __BIONIC_SIGDEF(signal_number, unused) [ signal_number ] = #signal_number + 3, #include <sys/_sigdefs.h> }; + +#endif |