[BACK]Return to lutil.h CVS log [TXT] [DIR] Up to [OpenLDAP] / include

Diff for /include/lutil.h between versions 1.55 and 1.82

version 1.55, 2004/03/19 07:06:42 version 1.82, 2011/03/01 00:19:37
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.54 2004/03/12 19:07:58 ando Exp $ */  /* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.81 2011/02/06 23:46:06 hyc 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-2004 The OpenLDAP Foundation.   * Copyright 1998-2011 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 48  lutil_b64_pton LDAP_P(( Line 48  lutil_b64_pton LDAP_P((
         size_t));          size_t));
   
 /* detach.c */  /* detach.c */
 LDAP_LUTIL_F( void )  LDAP_LUTIL_F( int )
 lutil_detach LDAP_P((  lutil_detach LDAP_P((
         int debug,          int debug,
         int do_close));          int do_close));
Line 110  lutil_authpasswd_hash LDAP_P(( Line 110  lutil_authpasswd_hash LDAP_P((
         struct berval **salt,   /* salt to store */          struct berval **salt,   /* salt to store */
         const char *method ));          const char *method ));
   
 #if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )  #ifdef SLAPD_CRYPT
         /* cheat to avoid pulling in <sasl.h> */  typedef int (lutil_cryptfunc) LDAP_P((
 LDAP_LUTIL_V( struct sasl_conn * ) lutil_passwd_sasl_conn;          const char *key,
           const char *salt,
           char **hash ));
   LDAP_LUTIL_V (lutil_cryptfunc *) lutil_cryptptr;
 #endif  #endif
   
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
Line 140  LDAP_LUTIL_F( int ) Line 143  LDAP_LUTIL_F( int )
 lutil_salt_format LDAP_P((  lutil_salt_format LDAP_P((
         const char *format ));          const char *format ));
   
   LDAP_LUTIL_F( int )
   lutil_passwd_string64 LDAP_P((
           const struct berval *sc,
           const struct berval *hash,
           struct berval *b64,
           const struct berval *salt ));
   
 /* utils.c */  /* utils.c */
 LDAP_LUTIL_F( char* )  LDAP_LUTIL_F( char* )
 lutil_progname LDAP_P((  lutil_progname LDAP_P((
Line 147  lutil_progname LDAP_P(( Line 157  lutil_progname LDAP_P((
         int argc,          int argc,
         char *argv[] ));          char *argv[] ));
   
   typedef struct lutil_tm {
           int tm_sec;     /* seconds 0-60 (1 leap second) */
           int tm_min;     /* minutes 0-59 */
           int tm_hour;    /* hours 0-23 */
           int tm_mday;    /* day 1-31 */
           int tm_mon;     /* month 0-11 */
           int tm_year;    /* year - 1900 */
           int tm_usec;    /* microseconds */
           int tm_usub;    /* submicro */
   } lutil_tm;
   
   typedef struct lutil_timet {
           unsigned int tt_sec;    /* seconds since 1900 */
           int tt_gsec;            /* seconds since 1900, high 7 bits */
           unsigned int tt_usec;   /* microseconds */
   } lutil_timet;
   
   /* Parse a timestamp string into a structure */
   LDAP_LUTIL_F( int )
   lutil_parsetime LDAP_P((
           char *atm, struct lutil_tm * ));
   
   /* Convert structured time to time in seconds since 1900 */
   LDAP_LUTIL_F( int )
   lutil_tm2time LDAP_P((
           struct lutil_tm *, struct lutil_timet * ));
   
 #ifdef _WIN32  #ifdef _WIN32
 LDAP_LUTIL_F( void )  LDAP_LUTIL_F( void )
 lutil_slashpath LDAP_P(( char* path ));  lutil_slashpath LDAP_P(( char* path ));
Line 161  lutil_strcopy LDAP_P(( char *dst, const Line 198  lutil_strcopy LDAP_P(( char *dst, const
 LDAP_LUTIL_F( char* )  LDAP_LUTIL_F( char* )
 lutil_strncopy LDAP_P(( char *dst, const char *src, size_t n ));  lutil_strncopy LDAP_P(( char *dst, const char *src, size_t n ));
   
   LDAP_LUTIL_F( char* )
   lutil_memcopy LDAP_P(( char *dst, const char *src, size_t n ));
   
   #define lutil_strbvcopy(a, bv) lutil_memcopy((a),(bv)->bv_val,(bv)->bv_len)
   
 struct tm;  struct tm;
   
 /* use this macro to statically allocate buffer for lutil_gentime */  /* use this macro to statically allocate buffer for lutil_gentime */
Line 185  lutil_pair( ber_socket_t sd[2] ); Line 227  lutil_pair( ber_socket_t sd[2] );
 LDAP_LUTIL_F( size_t )  LDAP_LUTIL_F( size_t )
 lutil_uuidstr( char *buf, size_t len );  lutil_uuidstr( char *buf, size_t len );
   
 /* csn.c */  LDAP_LUTIL_F( int )
 /* use this macro to allocate buffer for lutil_csnstr */  lutil_uuidstr_from_normalized(
 #define LDAP_LUTIL_CSNSTR_BUFSIZE       64          char            *uuid,
 LDAP_LUTIL_F( size_t )          size_t          uuidlen,
 lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );          char            *buf,
           size_t          buflen );
   
 /*  /*
  * Sometimes not all declarations in a header file are needed.   * Sometimes not all declarations in a header file are needed.
Line 246  lutil_LogStoppedEvent( char *svc ); Line 289  lutil_LogStoppedEvent( char *svc );
 #define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)  #define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
 #endif  #endif
   
   LDAP_LUTIL_F (int)
   lutil_atoix( int *v, const char *s, int x );
   
   LDAP_LUTIL_F (int)
   lutil_atoux( unsigned *v, const char *s, int x );
   
   LDAP_LUTIL_F (int)
   lutil_atolx( long *v, const char *s, int x );
   
   LDAP_LUTIL_F (int)
   lutil_atoulx( unsigned long *v, const char *s, int x );
   
   #define lutil_atoi(v, s)        lutil_atoix((v), (s), 10)
   #define lutil_atou(v, s)        lutil_atoux((v), (s), 10)
   #define lutil_atol(v, s)        lutil_atolx((v), (s), 10)
   #define lutil_atoul(v, s)       lutil_atoulx((v), (s), 10)
   
   #ifdef HAVE_LONG_LONG
   #if defined(HAVE_STRTOLL) || defined(HAVE_STRTOQ)
   LDAP_LUTIL_F (int)
   lutil_atollx( long long *v, const char *s, int x );
   #define lutil_atoll(v, s)       lutil_atollx((v), (s), 10)
   #endif /* HAVE_STRTOLL || HAVE_STRTOQ */
   
   #if defined(HAVE_STRTOULL) || defined(HAVE_STRTOUQ)
   LDAP_LUTIL_F (int)
   lutil_atoullx( unsigned long long *v, const char *s, int x );
   #define lutil_atoull(v, s)      lutil_atoullx((v), (s), 10)
   #endif /* HAVE_STRTOULL || HAVE_STRTOUQ */
   #endif /* HAVE_LONG_LONG */
   
   LDAP_LUTIL_F (int)
   lutil_str2bin( struct berval *in, struct berval *out, void *ctx );
   
   /* Parse and unparse time intervals */
   LDAP_LUTIL_F (int)
   lutil_parse_time( const char *in, unsigned long *tp );
   
   LDAP_LUTIL_F (int)
   lutil_unparse_time( char *buf, size_t buflen, unsigned long t );
   
   #ifdef timerdiv
   #define lutil_timerdiv timerdiv
   #else /* ! timerdiv */
   /* works inplace (x == t) */
   #define lutil_timerdiv(t,d,x) \
           do { \
                   time_t s = (t)->tv_sec; \
                   assert( d > 0 ); \
                   (x)->tv_sec = s / d; \
                   (x)->tv_usec = ( (t)->tv_usec + 1000000 * ( s % d ) ) / d; \
           } while ( 0 )
   #endif /* ! timerdiv */
   
   #ifdef timermul
   #define lutil_timermul timermul
   #else /* ! timermul */
   /* works inplace (x == t) */
   #define lutil_timermul(t,m,x) \
           do { \
                   time_t u = (t)->tv_usec * m; \
                   assert( m > 0 ); \
                   (x)->tv_sec = (t)->tv_sec * m + u / 1000000; \
                   (x)->tv_usec = u % 1000000; \
           } while ( 0 );
   #endif /* ! timermul */
   
 LDAP_END_DECL  LDAP_END_DECL
   
 #endif /* _LUTIL_H */  #endif /* _LUTIL_H */
Removed from v.1.55  
changed lines
  Added in v.1.82

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