X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil.h;h=b20be1d70f1678d279d0cfdd9bc1bb72d0b87049;hb=760f527af2d97f3aa744222e10905d356ef4fe06;hp=6b2bf76beface0d086256eeb03d310d7aaf82516;hpb=da6d9eb0463255782f3fa70c61fd958d94c048cf;p=openldap diff --git a/include/lutil.h b/include/lutil.h index 6b2bf76bef..b20be1d70f 100644 --- a/include/lutil.h +++ b/include/lutil.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2007 The OpenLDAP Foundation. + * Copyright 1998-2008 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -158,6 +158,7 @@ typedef struct lutil_tm { 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 { @@ -166,14 +167,20 @@ typedef struct lutil_timet { 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 * )); +/* Get current time as a structured time */ +LDAP_LUTIL_F( void ) +lutil_gettime LDAP_P(( struct lutil_tm * )); + #ifdef _WIN32 LDAP_LUTIL_F( void ) lutil_slashpath LDAP_P(( char* path )); @@ -212,6 +219,13 @@ lutil_pair( ber_socket_t sd[2] ); LDAP_LUTIL_F( size_t ) lutil_uuidstr( char *buf, size_t len ); +LDAP_LUTIL_F( int ) +lutil_uuidstr_from_normalized( + char *uuid, + size_t uuidlen, + char *buf, + size_t buflen ); + /* csn.c */ /* use this macro to allocate buffer for lutil_csnstr */ #define LDAP_LUTIL_CSNSTR_BUFSIZE 64 @@ -290,6 +304,10 @@ lutil_atoulx( unsigned long *v, const char *s, int x ); #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_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 );