generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 20811f9e: am 19718f0c: Merge "Rewrite and hide longjmperror."

Browse Source 
* commit '20811f9e87b86ba7171b9c9480a9212d787c732e':
  Rewrite and hide longjmperror.
This commit is contained in:
Elliott Hughes 2014-06-07 03:56:27 +00:00 committed by Android Git Automerger
commit 44ac8af8ed
4 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -270,7 +270,6 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/lib/libc/gen/nice.c \
upstream-netbsd/lib/libc/gen/popen.c \
upstream-netbsd/lib/libc/gen/psignal.c \
upstream-netbsd/lib/libc/gen/setjmperr.c \
upstream-netbsd/lib/libc/gen/utime.c \
upstream-netbsd/lib/libc/gen/utmp.c \
upstream-netbsd/lib/libc/isc/ev_streams.c \

6
libc/bionic/assert.cpp
View File

@ -34,10 +34,12 @@
void __assert(const char* file, int line, const char* failed_expression) {
__libc_fatal("%s:%d: assertion \"%s\" failed", file, line, failed_expression);
/* NOTREACHED */
}
void __assert2(const char* file, int line, const char* function, const char* failed_expression) {
__libc_fatal("%s:%d: %s: assertion \"%s\" failed", file, line, function, failed_expression);
/* NOTREACHED */
}
extern "C" __LIBC_HIDDEN__ void longjmperror() {
__libc_fatal("longjmp botch");
}

1
libc/include/setjmp.h
View File

@ -50,7 +50,6 @@ __BEGIN_DECLS
int _setjmp(jmp_buf);
void _longjmp(jmp_buf, int);
void longjmperror(void);
int setjmp(jmp_buf);
void longjmp(jmp_buf, int);

56
libc/upstream-netbsd/lib/libc/gen/setjmperr.c
View File

@ -1,56 +0,0 @@
/* $NetBSD: setjmperr.c,v 1.8 2012/06/24 15:26:03 christos Exp $ */
/*
* Copyright (c) 1980, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)setjmperr.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: setjmperr.c,v 1.8 2012/06/24 15:26:03 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
/*
* This routine is called from longjmp() when an error occurs.
* Programs that wish to exit gracefully from this error may
* write their own versions.
* If this routine returns, the program is aborted.
*/
#include <setjmp.h>
#include <unistd.h>
void
longjmperror(void)
{
#define ERRMSG "longjmp botch.\n"
(void)write(STDERR_FILENO, ERRMSG, sizeof(ERRMSG) - 1);
}