diff options
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert-perr.c | 31 | ||||
| -rw-r--r-- | assert/assert.c | 39 |
2 files changed, 34 insertions, 36 deletions
diff --git a/assert/assert-perr.c b/assert/assert-perr.c index f9aeb89..c62ae46 100644 --- a/assert/assert-perr.c +++ b/assert/assert-perr.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <assert.h> #include <stdio.h> @@ -38,6 +38,7 @@ __assert_perror_fail (int errnum, const char *file, unsigned int line, const char *function) { + char errbuf[1024]; #ifdef FATAL_PREPARE FATAL_PREPARE; #endif @@ -48,7 +49,7 @@ __assert_perror_fail (int errnum, __assert_program_name ? ": " : "", file, line, function ? function : "", function ? ": " : "", - strerror (errnum)); + __strerror_r (errnum, errbuf, sizeof errbuf)); (void) fflush (stderr); abort (); diff --git a/assert/assert.c b/assert/assert.c index 0160b40..33c6845 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -1,29 +1,28 @@ -/* Copyright (C) 1991, 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1994, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <sysdep.h> -CONST char *__assert_program_name; +const char *__assert_program_name; /* This function, when passed a string containing an asserted expression, a filename, and a line number, prints a message @@ -36,9 +35,8 @@ CONST char *__assert_program_name; #endif void -DEFUN(__assert_fail, (assertion, file, line, function), - CONST char *assertion AND - CONST char *file AND unsigned int line AND CONST char *function) +__assert_fail (const char *assertion, const char *file, unsigned int line, + const char *function) { #ifdef FATAL_PREPARE FATAL_PREPARE; @@ -61,8 +59,7 @@ DEFUN(__assert_fail, (assertion, file, line, function), #include <string.h> static void -DEFUN(set_progname, (argc, argv, envp), - int argc AND char **argv AND char **envp) +set_progname (int argc, char **argv, char **envp) { char *p; |