should we touch timestamps when internally updating?

[openldap] / servers / slapd / back-monitor / backend.c

diff --git a/servers/slapd/back-monitor/backend.c b/servers/slapd/back-monitor/backend.c
index 48db0592ea5a944ef0cb70d3f89d1566d588e186..d21582179102b764b365c610a81afb0f8b72abc4 100644 (file)
--- a/servers/slapd/back-monitor/backend.c
+++ b/servers/slapd/back-monitor/backend.c
@@ -2,7 +2,7 @@
 /* $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.
  *
@@ -33,17 +33,17 @@
  */
 int
 monitor_subsys_backend_init(
-       BackendDB       *be,
-       monitorsubsys   *ms
+       BackendDB               *be,
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t          *mi;
        Entry                   *e_backend, **ep;
        int                     i;
-       struct monitorentrypriv *mp;
-       monitorsubsys           *ms_database;
+       monitor_entry_t         *mp;
+       monitor_subsys_t        *ms_database;
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
        ms_database = monitor_back_get_subsys( SLAPD_MONITOR_DATABASE_NAME );
        if ( ms_database == NULL ) {
@@ -65,7 +65,7 @@ monitor_subsys_backend_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_backend->e_private;
+       mp = ( monitor_entry_t * )e_backend->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -76,7 +76,7 @@ monitor_subsys_backend_init(
                int             j;
                Entry           *e;
 
-               bi = &backendInfo[i];
+               bi = &backendInfo[ i ];
 
                snprintf( buf, sizeof( buf ),
                                "dn: cn=Backend %d,%s\n"
@@ -125,7 +125,7 @@ monitor_subsys_backend_init(
                }
 
                for ( j = 0; j < nBackendDB; j++ ) {
-                       BackendDB       *be = &backendDB[j];
+                       BackendDB       *be = &backendDB[ j ];
                        char            buf[ SLAP_LDAPDN_MAXLEN ];
                        struct berval   dn;
                        
@@ -142,13 +142,13 @@ monitor_subsys_backend_init(
                                        &dn, NULL );
                }
                
-               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;
+               mp->mp_flags = ms->mss_flags | MONITOR_F_SUB;
 
                if ( monitor_cache_add( mi, e ) ) {
                        Debug( LDAP_DEBUG_ANY,