libraries/libldap/result.c - diff

Return to result.c CVS log

Up to [OpenLDAP] / libraries / libldap

Diff for /libraries/libldap/result.c between versions 1.7 and 1.7.2.2

version 1.7, 1998/10/25 02:13:43	version 1.7.2.2, 1998/11/24 16:46:26
Line 32 static int wait4msg LDAP_P(( LDAP *ld, i	Line 32 static int wait4msg LDAP_P(( LDAP *ld, i
#ifdef LDAP_REFERRALS	#ifdef LDAP_REFERRALS
static int read1msg LDAP_P(( LDAP ld, int msgid, int all, Sockbuf sb, LDAPConn *lc,	static int read1msg LDAP_P(( LDAP ld, int msgid, int all, Sockbuf sb, LDAPConn *lc,
LDAPMessage **result ));	LDAPMessage **result ));
static int build_result_ber LDAP_P(( LDAP ld, BerElement ber, LDAPRequest *lr ));	static unsigned long build_result_ber LDAP_P(( LDAP ld, BerElement ber, LDAPRequest *lr ));
static void merge_error_info LDAP_P(( LDAP ld, LDAPRequest parentr, LDAPRequest *lr ));	static void merge_error_info LDAP_P(( LDAP ld, LDAPRequest parentr, LDAPRequest *lr ));
#else /* LDAP_REFERRALS */	#else /* LDAP_REFERRALS */
static int read1msg LDAP_P(( LDAP ld, int msgid, int all, Sockbuf sb,	static int read1msg LDAP_P(( LDAP ld, int msgid, int all, Sockbuf sb,
Line 151 wait4msg( LDAP *ld, int msgid, int all,	Line 151 wait4msg( LDAP *ld, int msgid, int all,
0, 0, 0 );	0, 0, 0 );
} else {	} else {
Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec)\n",	Debug( LDAP_DEBUG_TRACE, "wait4msg (timeout %ld sec, %ld usec)\n",
timeout->tv_sec, timeout->tv_usec, 0 );	(long) timeout->tv_sec, (long) timeout->tv_usec, 0 );
}	}
#endif /* LDAP_DEBUG */	#endif /* LDAP_DEBUG */

Line 246 wait4msg( LDAP *ld, int msgid, int all,	Line 246 wait4msg( LDAP *ld, int msgid, int all,
}	}

Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n",	Debug( LDAP_DEBUG_TRACE, "wait4msg: %ld secs to go\n",
tv.tv_sec, 0, 0 );	(long) tv.tv_sec, 0, 0 );
start_time = tmp_time;	start_time = tmp_time;
}	}
}	}
Line 512 lr->lr_res_matched ? lr->lr_res_matched	Line 512 lr->lr_res_matched ? lr->lr_res_matched


#ifdef LDAP_REFERRALS	#ifdef LDAP_REFERRALS
static int	static unsigned long
build_result_ber( LDAP ld, BerElement ber, LDAPRequest *lr )	build_result_ber( LDAP ld, BerElement ber, LDAPRequest *lr )
{	{
unsigned long len;	unsigned long len;
Line 523 build_result_ber( LDAP ld, BerElement	Line 523 build_result_ber( LDAP ld, BerElement
if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid,	if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid,
(long)lr->lr_res_msgtype, lr->lr_res_errno,	(long)lr->lr_res_msgtype, lr->lr_res_errno,
lr->lr_res_matched ? lr->lr_res_matched : "",	lr->lr_res_matched ? lr->lr_res_matched : "",
lr->lr_res_error ? lr->lr_res_error : "" ) == LBER_ERROR ) {	lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) {
return( LBER_ERROR );	return( LBER_ERROR );
}	}

Removed from v.1.7
changed lines
	Added in v.1.7.2.2