upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 17:19:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use and decl of ber_pvt_assert. Fix ac/stdio.h -> stdio.h.

Browse source
This commit is contained in:
Hallvard Furuseth 1999-07-13 03:50:39 +00:00
parent 79872b45b0
commit e2bfb420d7
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/ac/assert.h
View file

@ -17,9 +17,12 @@
#ifdef LDAP_DEBUG
#if defined( HAVE_ASSERT_H ) || defined( STDC_HEADERS )
#undef NDEBUG
#include <assert.h>
#else
#else /* !(HAVE_ASSERT_H || STDC_HEADERS) */
#define LDAP_NEED_ASSERT 1
/*
@ -27,19 +30,23 @@
* create a replacement and hope it works
*/
LDAP_F(void) ber_pvt_assert LDAP_F((
LDAP_F(void) ber_pvt_assert LDAP_P((
char* file, int line, char* test));
/* Can't use LDAP_STRING(test), that'd expand to "test" */
#if defined(__STDC__) || defined(__cplusplus)
#define assert(test) \
((test) \
? (void)0 \
: ber_pvt_assert( __FILE__, __LINE__, LDAP_STRING(test)) )
((test) ? (void)0 : ber_pvt_assert( __FILE__, __LINE__, #test ) )
#else
#define assert(test) \
((test) ? (void)0 : ber_pvt_assert( __FILE__, __LINE__, "test" ) )
#endif
#else
#endif /* (HAVE_ASSERT_H || STDC_HEADERS) */
#else /* !LDAP_DEBUG */
/* no asserts */
#define assert(test) ((void)0)
#endif
#endif /* LDAP_DEBUG */
#endif /* _AC_ASSERT_H */

5
libraries/liblber/assert.c
View file

@ -12,7 +12,7 @@
#ifdef LDAP_NEED_ASSERT
#include <ac/stdio.h>
#include <stdio.h>
/*
* helper for our private assert() macro
@ -22,7 +22,8 @@
* issue for now.
*/
void ber_pvt_assert(char* file, int line, char* test)
void
ber_pvt_assert( LDAP_CONST char *file, int line, LDAP_CONST char *test )
{
fprintf(stderr,
"Assertion failed: %s, file %s, line %d\n",