Restore K&R prototype. Fix other style bugs.

Reviewed by:	asmodai, bde
This commit is contained in:
Mike Barcroft 2001-10-27 19:37:20 +00:00
parent 4e4a76633b
commit c44a27673c
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=85605
2 changed files with 12 additions and 10 deletions

View file

@ -39,6 +39,8 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
/*
* Unlike other ANSI header files, <assert.h> may usefully be included
* multiple times, with and without NDEBUG defined.
@ -52,17 +54,16 @@
#define _assert(e) ((void)0)
#else
#define _assert(e) assert(e)
#ifdef __STDC__
#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
__LINE__, #e))
#else /* PCC */
__LINE__, #e))
#else /* !__STDC__ */
#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \
__LINE__, "e"))
#endif
#endif
#include <sys/cdefs.h>
__LINE__, "e"))
#endif /* __STDC__ */
#endif /* NDEBUG */
__BEGIN_DECLS
void __assert(const char *, const char *, int, const char *);
void __assert __P((const char *, const char *, int, const char *));
__END_DECLS

View file

@ -46,8 +46,9 @@ __FBSDID("$FreeBSD$");
void
__assert(function, file, line, failedexpr)
const char *failedexpr, *file, *function;
int line;
const char *function, *file;
int line;
const char *failedexpr;
{
(void)fprintf(stderr,
"assertion (%s) failed: function %s(), file %s:%d\n",