Diff for /libraries/libldap/result.c between versions 1.6.10.1 and 1.6.10.3

version 1.6.10.1, 1998/10/20 02:13:36 version 1.6.10.3, 1998/10/22 01:03:09
Line 38  static void merge_error_info LDAP_P(( LD Line 38  static void merge_error_info LDAP_P(( LD
 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,
         LDAPMessage **result ));          LDAPMessage **result ));
 #endif /* LDAP_REFERRALS */  #endif /* LDAP_REFERRALS */
 #if defined( CLDAP ) || !defined( LDAP_REFERRALS )  #if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_REFERRALS )
 static int ldap_select1 LDAP_P(( LDAP *ld, struct timeval *timeout ));  static int ldap_select1 LDAP_P(( LDAP *ld, struct timeval *timeout ));
 #endif  #endif
   
Line 438  lr->lr_res_matched ? lr->lr_res_matched Line 438  lr->lr_res_matched ? lr->lr_res_matched
         new->lm_msgtype = tag;          new->lm_msgtype = tag;
         new->lm_ber = ber_dup( &ber );          new->lm_ber = ber_dup( &ber );
   
 #ifndef NO_CACHE  #ifndef LDAP_NOCACHE
                 if ( ld->ld_cache != NULL ) {                  if ( ld->ld_cache != NULL ) {
                         ldap_add_result_to_cache( ld, new );                          ldap_add_result_to_cache( ld, new );
                 }                  }
 #endif /* NO_CACHE */  #endif /* LDAP_NOCACHE */
   
         /* is this the one we're looking for? */          /* is this the one we're looking for? */
         if ( msgid == LDAP_RES_ANY || id == msgid ) {          if ( msgid == LDAP_RES_ANY || id == msgid ) {
Line 588  merge_error_info( LDAP *ld, LDAPRequest Line 588  merge_error_info( LDAP *ld, LDAPRequest
   
   
   
 #if defined( CLDAP ) || !defined( LDAP_REFERRALS )  #if defined( LDAP_CONNECTIONLESS ) || !defined( LDAP_REFERRALS )
 #if !defined( MACOS ) && !defined( DOS ) && !defined( _WIN32 )  #if !defined( MACOS ) && !defined( DOS ) && !defined( _WIN32 )
 static int  static int
 ldap_select1( LDAP *ld, struct timeval *timeout )  ldap_select1( LDAP *ld, struct timeval *timeout )
Line 597  ldap_select1( LDAP *ld, struct timeval * Line 597  ldap_select1( LDAP *ld, struct timeval *
         static int      tblsize;          static int      tblsize;
   
         if ( tblsize == 0 ) {          if ( tblsize == 0 ) {
 #ifdef USE_SYSCONF  #ifdef HAVE_SYSCONF
                 tblsize = sysconf( _SC_OPEN_MAX );                  tblsize = sysconf( _SC_OPEN_MAX );
 #else /* !USE_SYSCONF */  #elif HAVE_GETDTABLESIZE
                 tblsize = getdtablesize();                  tblsize = getdtablesize();
 #endif /* !USE_SYSCONF */  #else
                   tblsize = FD_SETSIZE;
   #endif
 #ifdef FD_SETSIZE  #ifdef FD_SETSIZE
                 if ( tblsize > FD_SETSIZE ) {                  if ( tblsize > FD_SETSIZE ) {
                         tblsize = FD_SETSIZE;                          tblsize = FD_SETSIZE;
Line 782  ldap_mark_abandoned( LDAP *ld, int msgid Line 784  ldap_mark_abandoned( LDAP *ld, int msgid
 }  }
   
   
 #ifdef CLDAP  #ifdef LDAP_CONNECTIONLESS
 int  int
 cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber )  cldap_getmsg( LDAP *ld, struct timeval *timeout, BerElement *ber )
 {  {
Line 808  cldap_getmsg( LDAP *ld, struct timeval * Line 810  cldap_getmsg( LDAP *ld, struct timeval *
   
         return( tag );          return( tag );
 }  }
 #endif /* CLDAP */  #endif /* LDAP_CONNECTIONLESS */

Removed from v.1.6.10.1  
changed lines
  Added in v.1.6.10.3


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org