Only provide function information in compile environments that support

the C99 variable __func__ and never for C++.  Provide a more meaningful
example in the assert(3) manual.

Reviewed by:	asmodai, bde

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/libstand/assert.c b/lib/libstand/assert.c
index 9317dcf..6d0ab89 100644
--- a/lib/libstand/assert.c
+++ b/lib/libstand/assert.c
@@ -32,10 +32,13 @@ __FBSDID("$FreeBSD$");
 #include "stand.h"
 
 void
-__assert(const char *function, const char *file, int line,
-	 const char *expression)
+__assert(const char *func, const char *file, int line, const char *expression)
 {
-	printf("assertion (%s) failed: function %s(), file %s:%d\n",
-	       expression, function, file, line);
+	if (func == NULL)
+		printf("assertion (%s) failed: file %s:%d\n", expression,
+		    file, line);
+	else
+		printf("assertion (%s) failed: function %s(), file %s:%d\n",
+		    expression, func, file, line);
 	exit();
 }