/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
int
monitor_subsys_time_init(
BackendDB *be,
- monitorsubsys *ms
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
+ monitor_info_t *mi;
- Entry *e, **ep, *e_time;
- struct monitorentrypriv *mp;
- char buf[ BACKMONITOR_BUFSIZE ];
+ Entry *e, **ep, *e_time;
+ monitor_entry_t *mp;
+ char buf[ BACKMONITOR_BUFSIZE ];
assert( be != NULL );
- mi = ( struct monitorinfo * )be->be_private;
+ mi = ( monitor_info_t * )be->be_private;
if ( monitor_cache_get( mi,
&ms->mss_ndn, &e_time ) ) {
return( -1 );
}
- mp = ( struct monitorentrypriv * )e_time->e_private;
+ mp = ( monitor_entry_t * )e_time->e_private;
mp->mp_children = NULL;
ep = &mp->mp_children;
return( -1 );
}
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = NULL;
- mp->mp_children = NULL;
mp->mp_info = ms;
mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
return( -1 );
}
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = NULL;
- mp->mp_children = NULL;
mp->mp_info = ms;
mp->mp_flags = ms->mss_flags \
| MONITOR_F_SUB | MONITOR_F_PERSISTENT;
Entry *e
)
{
- struct monitorinfo *mi =
- (struct monitorinfo *)op->o_bd->be_private;
-
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
static struct berval bv_current = BER_BVC( "cn=current" );
struct berval rdn;
return( -1 );
}
- assert( len == a->a_vals[0].bv_len );
- AC_MEMCPY( a->a_vals[0].bv_val, tmbuf, len );
+ assert( len == a->a_vals[ 0 ].bv_len );
+ AC_MEMCPY( a->a_vals[ 0 ].bv_val, tmbuf, len );
+
+ /* FIXME: touch modifyTimestamp? */
}
return( 0 );