Sync with HEAD

This commit is contained in:
Kurt Zeilenga 2004-04-11 18:57:42 +00:00
parent 4f1a11d11f
commit f7a74dc0bb
3 changed files with 16 additions and 3 deletions

View file

@ -89,4 +89,6 @@ int (strncasecmp)();
else AC_MEMCPY( (d), (s), (n) ); \
} while(0)
#define STRLENOF(s) (sizeof(s)-1)
#endif /* _AC_STRING_H */

View file

@ -165,8 +165,20 @@ ber_bvarray_add_x LDAP_P(( BerVarray *p, BerValue *bv, void *ctx ));
#define ber_bvchr(bv,c) \
memchr( (bv)->bv_val, (c), (bv)->bv_len )
#define BER_BVC(x) { sizeof( (x) ) - 1, (x) }
#define BER_BVNULL { 0L, NULL }
#define BER_BVC(s) { sizeof(s) - 1, (s) }
#define BER_BVNULL { 0L, NULL }
#define BER_BVZERO(bv) \
do { \
(bv)->bv_len = 0; \
(bv)->bv_val = NULL; \
} while (0)
#define BER_BVSTR(bv,s) \
do { \
(bv)->bv_len = sizeof(s)-1; \
(bv)->bv_val = (s); \
} while (0)
#define BER_BVISNULL(bv) ((bv)->bv_val == NULL)
#define BER_BVISEMPTY(bv) ((bv)->bv_len == 0)
LDAP_END_DECL

View file

@ -851,7 +851,6 @@ sb_debug_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
"%swrite: want=%ld error=%s\n",
(char *)sbiod->sbiod_pvt, (long)len,
STRERROR( errno ) );
errno = err;
} else {
ber_log_printf( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
"%swrite: want=%ld, written=%ld\n",