Diff for /libraries/libldap/result.c between versions 1.7.2.3 and 1.8

version 1.7.2.3, 1998/12/31 19:32:07 version 1.8, 1998/10/26 00:18:44
Line 1 Line 1
 /*  /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.  
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file  
  */  
 /*  Portions  
  *  Copyright (c) 1990 Regents of the University of Michigan.   *  Copyright (c) 1990 Regents of the University of Michigan.
  *  All rights reserved.   *  All rights reserved.
  *   *
Line 11 Line 7
   
 #include "portable.h"  #include "portable.h"
   
   #ifndef lint 
   static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
   #endif
   
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
   
Line 20 Line 20
 #include <ac/time.h>  #include <ac/time.h>
 #include <ac/unistd.h>  #include <ac/unistd.h>
   
 #include "lber.h"  
 #include "ldap.h"  
 #include "ldap-int.h"  #include "ldap-int.h"
   
   
Line 32  static int wait4msg LDAP_P(( LDAP *ld, i Line 30  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 unsigned long build_result_ber LDAP_P(( LDAP *ld, BerElement *ber, LDAPRequest *lr ));  static int 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 149  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",
                        (long) timeout->tv_sec, (long) timeout->tv_usec, 0 );                      timeout->tv_sec, timeout->tv_usec, 0 );
         }          }
 #endif /* LDAP_DEBUG */  #endif /* LDAP_DEBUG */
   
Line 246  wait4msg( LDAP *ld, int msgid, int all, Line 244  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",
                                (long) tv.tv_sec, 0, 0 );                                  tv.tv_sec, 0, 0 );
                         start_time = tmp_time;                          start_time = tmp_time;
                 }                  }
         }          }
Line 512  lr->lr_res_matched ? lr->lr_res_matched Line 510  lr->lr_res_matched ? lr->lr_res_matched
   
   
 #ifdef LDAP_REFERRALS  #ifdef LDAP_REFERRALS
 static unsigned long  static int
 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 521  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 : "" ) == -1 ) {              lr->lr_res_error ? lr->lr_res_error : "" ) == LBER_ERROR ) {
                 return( LBER_ERROR );                  return( LBER_ERROR );
         }          }
   

Removed from v.1.7.2.3  
changed lines
  Added in v.1.8


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