From: Howard Chu <hyc@openldap.org>
Date: Mon, 31 Dec 2001 12:57:17 +0000 (+0000)
Subject: Tweak previous commit
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~391
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ac39aa5032c19637e880d337baed61241d48483d;p=openldap

Tweak previous commit
---

diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index dc31e8696e..68c8af6184 100644
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -821,12 +821,11 @@ sb_debug_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
 	ret = LBER_SBIOD_READ_NEXT( sbiod, buf, len );
 	if (sbiod->sbiod_sb->sb_debug & LDAP_DEBUG_PACKETS)
 	{
+	    int err = errno;
 	    if ( ret < 0 ) {
-	    	int err = errno;
 		ber_log_printf( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
 			"%sread: 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,
 			"%sread: want=%ld, got=%ld\n", (char *)sbiod->sbiod_pvt,
@@ -834,6 +833,7 @@ sb_debug_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
 		ber_log_bprint( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
 			(const char *)buf, ret );
 	    }
+	    errno = err;
 	}
 	return ret;
 }
@@ -846,8 +846,8 @@ sb_debug_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
 	ret = LBER_SBIOD_WRITE_NEXT( sbiod, buf, len );
 	if (sbiod->sbiod_sb->sb_debug & LDAP_DEBUG_PACKETS)
 	{
+	    int err = errno;
 	    if ( ret < 0 ) {
-	    	int err = errno;
 		ber_log_printf( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
 			"%swrite: want=%ld error=%s\n",
 			(char *)sbiod->sbiod_pvt, (long)len,
@@ -860,6 +860,7 @@ sb_debug_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len )
 		ber_log_bprint( LDAP_DEBUG_PACKETS, sbiod->sbiod_sb->sb_debug,
 			(const char *)buf, ret );
 	    }
+	    errno = err;
 	}
 
 	return ret;