Cleanup prev commit

This commit is contained in:
Howard Chu 2009-10-26 19:19:20 +00:00
parent 1155f5ff20
commit 30c55952d3

View File

@ -679,14 +679,14 @@ sb_sasl_generic_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
{ {
struct sb_sasl_generic_data *p; struct sb_sasl_generic_data *p;
int ret; int ret;
ber_len_t len2, sent; ber_len_t len2;
assert( sbiod != NULL ); assert( sbiod != NULL );
assert( SOCKBUF_VALID( sbiod->sbiod_sb ) ); assert( SOCKBUF_VALID( sbiod->sbiod_sb ) );
p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt; p = (struct sb_sasl_generic_data *)sbiod->sbiod_pvt;
/* Are there anything left in the buffer? */ /* Is there anything left in the buffer? */
if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
ret = ber_pvt_sb_do_write( sbiod, &p->buf_out ); ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
if ( ret < 0 ) return ret; if ( ret < 0 ) return ret;
@ -725,12 +725,12 @@ sb_sasl_generic_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
return -1; return -1;
} }
sent = ber_pvt_sb_do_write( sbiod, &p->buf_out ); ret = ber_pvt_sb_do_write( sbiod, &p->buf_out );
if ( sent < 0 ) { if ( ret < 0 ) {
/* error? */ /* error? */
len2 = sent; return ret;
} else if ( sent != p->buf_out.buf_end ) { } else if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) {
/* partial write? */ /* partial write? */
len2--; len2--;
p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE; p->flags |= LDAP_PVT_SASL_PARTIAL_WRITE;