From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 11 Apr 2004 18:57:42 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_9~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f7a74dc0bb59f6cd1eb2e280888d1119f03be7ca;p=openldap

Sync with HEAD
---

diff --git a/include/ac/string.h b/include/ac/string.h
index e19811ce41..791bb009c9 100644
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -89,4 +89,6 @@ int (strncasecmp)();
 		else AC_MEMCPY( (d), (s), (n) ); \
 	} while(0)
 
+#define STRLENOF(s)	(sizeof(s)-1)
+
 #endif /* _AC_STRING_H */
diff --git a/include/lber_pvt.h b/include/lber_pvt.h
index 695d9dfb5d..ffc09626bc 100644
--- a/include/lber_pvt.h
+++ b/include/lber_pvt.h
@@ -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
 
diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index f5c2d53752..3dcd510653 100644
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -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",