Diff for /libraries/liblber/decode.c between versions 1.96.2.4 and 1.101

version 1.96.2.4, 2005/01/20 17:01:00 version 1.101, 2004/09/04 02:54:28
Line 1 Line 1
 /* decode.c - ber input decoding routines */  /* decode.c - ber input decoding routines */
 /* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.96.2.3 2004/01/01 18:16:29 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.100 2004/01/01 18:15:25 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2005 The OpenLDAP Foundation.   * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 669  ber_scanf ( BerElement *ber, Line 669  ber_scanf ( BerElement *ber,
   
         fmt_reset = fmt;          fmt_reset = fmt;
   
 #ifdef NEW_LOGGING  
         LDAP_LOG( BER, ENTRY, "ber_scanf fmt (%s) ber:\n", fmt, 0, 0 );  
   
         if ( LDAP_LOGS_TEST(BER, DETAIL2 )) {  
                         BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));  
         }  
 #else  
         ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,          ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
                 "ber_scanf fmt (%s) ber:\n", fmt );                  "ber_scanf fmt (%s) ber:\n", fmt );
         ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );          ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
 #endif  
   
         for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {          for ( rc = 0; *fmt && rc != LBER_DEFAULT; fmt++ ) {
                 /* When this is modified, remember to update                  /* When this is modified, remember to update
Line 824  ber_scanf ( BerElement *ber, Line 816  ber_scanf ( BerElement *ber,
   
                 default:                  default:
                         if( ber->ber_debug ) {                          if( ber->ber_debug ) {
 #ifdef NEW_LOGGING  
                                 LDAP_LOG( BER, ERR,   
                                         "ber_scanf: unknown fmt %c\n", *fmt, 0, 0 );  
 #else  
                                 ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,                                  ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
                                         "ber_scanf: unknown fmt %c\n", *fmt );                                          "ber_scanf: unknown fmt %c\n", *fmt );
 #endif  
                         }                          }
                         rc = LBER_DEFAULT;                          rc = LBER_DEFAULT;
                         break;                          break;

Removed from v.1.96.2.4  
changed lines
  Added in v.1.101


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