fix rebind with idassert when a connection expires; also, fix override

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index abfc595867683e87cc83915179e5f9da863b51a0..1fd11221e93996217baf3bdea16fff94cdbe93a3 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -150,7 +150,7 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
-struct lutil_tm {
+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 */
@@ -160,7 +160,7 @@ struct lutil_tm {
        int tm_usec;    /* microseconds */
 } lutil_tm;
 
-struct lutil_timet {
+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 */
@@ -273,6 +273,29 @@ lutil_LogStoppedEvent( char *svc );
 #define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
 #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)
+
+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 );
+
 LDAP_END_DECL
 
 #endif /* _LUTIL_H */