include/lutil.h - diff

Return to lutil.h CVS log

Up to [OpenLDAP] / include

Diff for /include/lutil.h between versions 1.63.2.12 and 1.64

version 1.63.2.12, 2011/01/04 23:49:54	version 1.64, 2006/10/21 16:57:27
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.63.2.11 2010/12/21 23:21:32 quanah Exp $ */	/* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.63 2006/01/03 22:12:06 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-2011 The OpenLDAP Foundation.	* Copyright 1998-2006 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 158 typedef struct lutil_tm {	Line 158 typedef struct lutil_tm {
int tm_mon; /* month 0-11 */	int tm_mon; /* month 0-11 */
int tm_year; /* year - 1900 */	int tm_year; /* year - 1900 */
int tm_usec; /* microseconds */	int tm_usec; /* microseconds */
int tm_usub; /* submicro */
} lutil_tm;	} lutil_tm;

typedef struct lutil_timet {	typedef struct lutil_timet {
Line 167 typedef struct lutil_timet {	Line 166 typedef struct lutil_timet {
unsigned int tt_usec; /* microseconds */	unsigned int tt_usec; /* microseconds */
} lutil_timet;	} lutil_timet;

/* Parse a timestamp string into a structure */
LDAP_LUTIL_F( int )	LDAP_LUTIL_F( int )
lutil_parsetime LDAP_P((	lutil_parsetime LDAP_P((
char atm, struct lutil_tm ));	char atm, struct lutil_tm ));

/* Convert structured time to time in seconds since 1900 */
LDAP_LUTIL_F( int )	LDAP_LUTIL_F( int )
lutil_tm2time LDAP_P((	lutil_tm2time LDAP_P((
struct lutil_tm , struct lutil_timet ));	struct lutil_tm , struct lutil_timet ));
Line 191 lutil_strcopy LDAP_P(( char *dst, const	Line 188 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 220 lutil_pair( ber_socket_t sd[2] );	Line 212 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 );

LDAP_LUTIL_F( int )	/* csn.c */
lutil_uuidstr_from_normalized(	/* use this macro to allocate buffer for lutil_csnstr */
char *uuid,	#define LDAP_LUTIL_CSNSTR_BUFSIZE 64
size_t uuidlen,	LDAP_LUTIL_F( size_t )
char *buf,	lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );
size_t buflen );

/*	/*
* Sometimes not all declarations in a header file are needed.	* Sometimes not all declarations in a header file are needed.
Line 299 lutil_atoulx( unsigned long *v, const ch	Line 290 lutil_atoulx( unsigned long *v, const ch
#define lutil_atol(v, s) lutil_atolx((v), (s), 10)	#define lutil_atol(v, s) lutil_atolx((v), (s), 10)
#define lutil_atoul(v, s) lutil_atoulx((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)	LDAP_LUTIL_F (int)
lutil_parse_time( const char in, unsigned long tp );	lutil_parse_time( const char in, unsigned long tp );

Removed from v.1.63.2.12
changed lines
	Added in v.1.64